aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoyuan Yang <073plan@gmail.com>2018-06-02 17:23:22 +0800
committerBoyuan Yang <073plan@gmail.com>2018-06-02 17:24:50 +0800
commit791fde30e7c874cecb5a0220593130a16279c366 (patch)
tree1584247cb4ba787a0fd97f48817b5114cdc6de8a
parent3c508740e4547501e8db1652b165b85a38036086 (diff)
footer: Update src url to salsa git repo; refresh po files
Here are the commands I used: cd ./english/po/; make pot; cd ../../; for i in albanian/po/ arabic/po/ armenian/po/ bulgarian/po/ catalan/po/ chinese/po/ croatian/po/ czech/po/ danish/po/ dutch/po/ esperanto/po/ finnish/po/ french/po/ galician/po/ german/po/ greek/po/ hebrew/po/ hungarian/po/ indonesian/po/ italian/po/ japanese/po/ korean/po/ lithuanian/po/ norwegian/po/ persian/po/ polish/po/ portuguese/po/ romanian/po/ russian/po/ slovak/po/ slovene/po/ spanish/po/ swedish/po/ tamil/po/ turkish/po/ ukrainian/po/ vietnamese/po/ ; do (cd $i; make update-po ; ) ; done
-rw-r--r--albanian/po/doc.sq.po10
-rw-r--r--albanian/po/organization.sq.po142
-rw-r--r--albanian/po/stats.sq.po121
-rw-r--r--albanian/po/templates.sq.po14
-rw-r--r--arabic/po/blends.ar.po38
-rw-r--r--arabic/po/doc.ar.po60
-rw-r--r--arabic/po/organization.ar.po158
-rw-r--r--arabic/po/others.ar.po16
-rw-r--r--arabic/po/partners.ar.po506
-rw-r--r--arabic/po/ports.ar.po170
-rw-r--r--arabic/po/stats.ar.po121
-rw-r--r--arabic/po/templates.ar.po37
-rw-r--r--arabic/po/vendors.ar.po32
-rw-r--r--armenian/po/blends.hy.po38
-rw-r--r--armenian/po/distrib.hy.po14
-rw-r--r--armenian/po/doc.hy.po60
-rw-r--r--armenian/po/organization.hy.po150
-rw-r--r--armenian/po/partners.hy.po506
-rw-r--r--armenian/po/stats.hy.po121
-rw-r--r--armenian/po/templates.hy.po14
-rw-r--r--armenian/po/vendors.hy.po32
-rw-r--r--bulgarian/po/blends.bg.po38
-rw-r--r--bulgarian/po/bugs.bg.po198
-rw-r--r--bulgarian/po/distrib.bg.po24
-rw-r--r--bulgarian/po/doc.bg.po127
-rw-r--r--bulgarian/po/l10n.bg.po6
-rw-r--r--bulgarian/po/mailinglists.bg.po6
-rw-r--r--bulgarian/po/organization.bg.po264
-rw-r--r--bulgarian/po/others.bg.po194
-rw-r--r--bulgarian/po/partners.bg.po506
-rw-r--r--bulgarian/po/ports.bg.po38
-rw-r--r--bulgarian/po/stats.bg.po131
-rw-r--r--bulgarian/po/templates.bg.po778
-rw-r--r--bulgarian/po/vendors.bg.po32
-rw-r--r--catalan/po/blends.ca.po38
-rw-r--r--catalan/po/bugs.ca.po198
-rw-r--r--catalan/po/distrib.ca.po66
-rw-r--r--catalan/po/doc.ca.po66
-rw-r--r--catalan/po/l10n.ca.po6
-rw-r--r--catalan/po/mailinglists.ca.po6
-rw-r--r--catalan/po/organization.ca.po290
-rw-r--r--catalan/po/others.ca.po198
-rw-r--r--catalan/po/partners.ca.po506
-rw-r--r--catalan/po/ports.ca.po174
-rw-r--r--catalan/po/stats.ca.po121
-rw-r--r--catalan/po/templates.ca.po841
-rw-r--r--catalan/po/vendors.ca.po94
-rw-r--r--chinese/po/blends.zh.po53
-rw-r--r--chinese/po/bugs.zh.po190
-rw-r--r--chinese/po/cdimage.zh.po1
-rw-r--r--chinese/po/countries.zh.po6
-rw-r--r--chinese/po/date.zh.po1
-rw-r--r--chinese/po/distrib.zh.po3
-rw-r--r--chinese/po/doc.zh.po102
-rw-r--r--chinese/po/mailinglists.zh.po21
-rw-r--r--chinese/po/newsevents.zh.po4
-rw-r--r--chinese/po/organization.zh.po239
-rw-r--r--chinese/po/others.zh.po146
-rw-r--r--chinese/po/partners.zh.po506
-rw-r--r--chinese/po/ports.zh.po40
-rw-r--r--chinese/po/stats.zh.po141
-rw-r--r--chinese/po/templates.zh.po380
-rw-r--r--chinese/po/vendors.zh.po95
-rw-r--r--chinese/po/vote.zh.po2
-rw-r--r--chinese/po/wnpp.zh.po2
-rw-r--r--croatian/po/distrib.hr.po40
-rw-r--r--croatian/po/doc.hr.po16
-rw-r--r--croatian/po/mailinglists.hr.po6
-rw-r--r--croatian/po/organization.hr.po106
-rw-r--r--croatian/po/others.hr.po248
-rw-r--r--croatian/po/ports.hr.po46
-rw-r--r--croatian/po/stats.hr.po121
-rw-r--r--croatian/po/templates.hr.po700
-rw-r--r--croatian/po/vendors.hr.po94
-rw-r--r--czech/po/blends.cs.po38
-rw-r--r--czech/po/bugs.cs.po190
-rw-r--r--czech/po/distrib.cs.po6
-rw-r--r--czech/po/doc.cs.po66
-rw-r--r--czech/po/organization.cs.po150
-rw-r--r--czech/po/partners.cs.po506
-rw-r--r--czech/po/stats.cs.po121
-rw-r--r--czech/po/templates.cs.po36
-rw-r--r--danish/po/blends.da.po52
-rw-r--r--danish/po/bugs.da.po198
-rw-r--r--danish/po/countries.da.po6
-rw-r--r--danish/po/distrib.da.po64
-rw-r--r--danish/po/doc.da.po587
-rw-r--r--danish/po/l10n.da.po8
-rw-r--r--danish/po/mailinglists.da.po6
-rw-r--r--danish/po/organization.da.po326
-rw-r--r--danish/po/others.da.po302
-rw-r--r--danish/po/partners.da.po26
-rw-r--r--danish/po/ports.da.po180
-rw-r--r--danish/po/stats.da.po133
-rw-r--r--danish/po/templates.da.po898
-rw-r--r--danish/po/vendors.da.po102
-rw-r--r--dutch/po/blends.nl.po57
-rw-r--r--dutch/po/distrib.nl.po24
-rw-r--r--dutch/po/doc.nl.po627
-rw-r--r--dutch/po/organization.nl.po40
-rw-r--r--dutch/po/others.nl.po16
-rw-r--r--dutch/po/partners.nl.po14
-rw-r--r--dutch/po/ports.nl.po38
-rw-r--r--dutch/po/stats.nl.po125
-rw-r--r--dutch/po/templates.nl.po25
-rw-r--r--dutch/po/vendors.nl.po32
-rw-r--r--english/po/doc.pot7
-rw-r--r--english/po/stats.pot178
-rw-r--r--english/po/templates.pot6
-rw-r--r--english/template/debian/footer.wml2
-rw-r--r--esperanto/po/blends.eo.po38
-rw-r--r--esperanto/po/doc.eo.po60
-rw-r--r--esperanto/po/organization.eo.po162
-rw-r--r--esperanto/po/partners.eo.po506
-rw-r--r--esperanto/po/stats.eo.po121
-rw-r--r--esperanto/po/templates.eo.po364
-rw-r--r--finnish/po/blends.fi.po52
-rw-r--r--finnish/po/bugs.fi.po200
-rw-r--r--finnish/po/countries.fi.po6
-rw-r--r--finnish/po/distrib.fi.po64
-rw-r--r--finnish/po/doc.fi.po565
-rw-r--r--finnish/po/l10n.fi.po6
-rw-r--r--finnish/po/mailinglists.fi.po6
-rw-r--r--finnish/po/organization.fi.po298
-rw-r--r--finnish/po/others.fi.po220
-rw-r--r--finnish/po/partners.fi.po506
-rw-r--r--finnish/po/ports.fi.po180
-rw-r--r--finnish/po/stats.fi.po131
-rw-r--r--finnish/po/templates.fi.po716
-rw-r--r--finnish/po/vendors.fi.po94
-rw-r--r--french/po/blends.fr.po6
-rw-r--r--french/po/distrib.fr.po24
-rw-r--r--french/po/doc.fr.po21
-rw-r--r--french/po/mailinglists.fr.po8
-rw-r--r--french/po/newsevents.fr.po24
-rw-r--r--french/po/organization.fr.po194
-rw-r--r--french/po/others.fr.po16
-rw-r--r--french/po/partners.fr.po31
-rw-r--r--french/po/ports.fr.po38
-rw-r--r--french/po/stats.fr.po131
-rw-r--r--french/po/templates.fr.po71
-rw-r--r--french/po/vendors.fr.po32
-rw-r--r--galician/po/blends.gl.po38
-rw-r--r--galician/po/doc.gl.po565
-rw-r--r--galician/po/organization.gl.po188
-rw-r--r--galician/po/others.gl.po16
-rw-r--r--galician/po/partners.gl.po506
-rw-r--r--galician/po/stats.gl.po125
-rw-r--r--galician/po/templates.gl.po14
-rw-r--r--galician/po/vendors.gl.po32
-rw-r--r--german/po/doc.de.po609
-rw-r--r--german/po/mailinglists.de.po6
-rw-r--r--german/po/organization.de.po56
-rw-r--r--german/po/others.de.po16
-rw-r--r--german/po/ports.de.po38
-rw-r--r--german/po/stats.de.po133
-rw-r--r--german/po/templates.de.po51
-rw-r--r--german/po/vendors.de.po48
-rw-r--r--greek/po/blends.el.po38
-rw-r--r--greek/po/bugs.el.po190
-rw-r--r--greek/po/distrib.el.po42
-rw-r--r--greek/po/doc.el.po72
-rw-r--r--greek/po/l10n.el.po6
-rw-r--r--greek/po/mailinglists.el.po6
-rw-r--r--greek/po/organization.el.po257
-rw-r--r--greek/po/others.el.po158
-rw-r--r--greek/po/partners.el.po506
-rw-r--r--greek/po/ports.el.po80
-rw-r--r--greek/po/stats.el.po121
-rw-r--r--greek/po/templates.el.po598
-rw-r--r--greek/po/vendors.el.po94
-rw-r--r--hebrew/po/blends.he.po38
-rw-r--r--hebrew/po/doc.he.po60
-rw-r--r--hebrew/po/organization.he.po189
-rw-r--r--hebrew/po/others.he.po188
-rw-r--r--hebrew/po/partners.he.po506
-rw-r--r--hebrew/po/ports.he.po38
-rw-r--r--hebrew/po/stats.he.po121
-rw-r--r--hebrew/po/templates.he.po36
-rw-r--r--hungarian/po/blends.hu.po38
-rw-r--r--hungarian/po/countries.hu.po6
-rw-r--r--hungarian/po/distrib.hu.po66
-rw-r--r--hungarian/po/doc.hu.po66
-rw-r--r--hungarian/po/mailinglists.hu.po6
-rw-r--r--hungarian/po/organization.hu.po269
-rw-r--r--hungarian/po/others.hu.po79
-rw-r--r--hungarian/po/partners.hu.po506
-rw-r--r--hungarian/po/ports.hu.po38
-rw-r--r--hungarian/po/stats.hu.po121
-rw-r--r--hungarian/po/templates.hu.po322
-rw-r--r--hungarian/po/vendors.hu.po94
-rw-r--r--indonesian/po/blends.id.po54
-rw-r--r--indonesian/po/distrib.id.po66
-rw-r--r--indonesian/po/doc.id.po621
-rw-r--r--indonesian/po/mailinglists.id.po6
-rw-r--r--indonesian/po/organization.id.po241
-rw-r--r--indonesian/po/others.id.po16
-rw-r--r--indonesian/po/partners.id.po506
-rw-r--r--indonesian/po/stats.id.po125
-rw-r--r--indonesian/po/templates.id.po360
-rw-r--r--italian/po/blends.it.po38
-rw-r--r--italian/po/bugs.it.po198
-rw-r--r--italian/po/countries.it.po2
-rw-r--r--italian/po/distrib.it.po24
-rw-r--r--italian/po/doc.it.po806
-rw-r--r--italian/po/l10n.it.po6
-rw-r--r--italian/po/organization.it.po276
-rw-r--r--italian/po/others.it.po81
-rw-r--r--italian/po/partners.it.po506
-rw-r--r--italian/po/stats.it.po141
-rw-r--r--italian/po/templates.it.po189
-rw-r--r--italian/po/vendors.it.po40
-rw-r--r--japanese/po/blends.ja.po52
-rw-r--r--japanese/po/bugs.ja.po192
-rw-r--r--japanese/po/doc.ja.po558
-rw-r--r--japanese/po/mailinglists.ja.po6
-rw-r--r--japanese/po/organization.ja.po172
-rw-r--r--japanese/po/others.ja.po16
-rw-r--r--japanese/po/partners.ja.po506
-rw-r--r--japanese/po/ports.ja.po180
-rw-r--r--japanese/po/stats.ja.po131
-rw-r--r--japanese/po/templates.ja.po14
-rw-r--r--korean/po/bugs.ko.po16
-rw-r--r--korean/po/countries.ko.po6
-rw-r--r--korean/po/distrib.ko.po18
-rw-r--r--korean/po/doc.ko.po10
-rw-r--r--korean/po/mailinglists.ko.po6
-rw-r--r--korean/po/organization.ko.po186
-rw-r--r--korean/po/others.ko.po30
-rw-r--r--korean/po/ports.ko.po10
-rw-r--r--korean/po/stats.ko.po123
-rw-r--r--korean/po/templates.ko.po14
-rw-r--r--korean/po/vendors.ko.po54
-rw-r--r--lithuanian/po/blends.lt.po38
-rw-r--r--lithuanian/po/bugs.lt.po190
-rw-r--r--lithuanian/po/distrib.lt.po46
-rw-r--r--lithuanian/po/doc.lt.po66
-rw-r--r--lithuanian/po/mailinglists.lt.po6
-rw-r--r--lithuanian/po/organization.lt.po272
-rw-r--r--lithuanian/po/others.lt.po16
-rw-r--r--lithuanian/po/partners.lt.po506
-rw-r--r--lithuanian/po/ports.lt.po170
-rw-r--r--lithuanian/po/stats.lt.po121
-rw-r--r--lithuanian/po/templates.lt.po522
-rw-r--r--lithuanian/po/vendors.lt.po94
-rw-r--r--norwegian/po/blends.nb.po38
-rw-r--r--norwegian/po/bugs.nb.po146
-rw-r--r--norwegian/po/countries.nb.po6
-rw-r--r--norwegian/po/distrib.nb.po26
-rw-r--r--norwegian/po/doc.nb.po66
-rw-r--r--norwegian/po/mailinglists.nb.po6
-rw-r--r--norwegian/po/organization.nb.po286
-rw-r--r--norwegian/po/others.nb.po176
-rw-r--r--norwegian/po/partners.nb.po506
-rw-r--r--norwegian/po/ports.nb.po38
-rw-r--r--norwegian/po/stats.nb.po129
-rw-r--r--norwegian/po/templates.nb.po540
-rw-r--r--norwegian/po/vendors.nb.po96
-rw-r--r--persian/po/blends.fa.po38
-rw-r--r--persian/po/bugs.fa.po198
-rw-r--r--persian/po/distrib.fa.po32
-rw-r--r--persian/po/doc.fa.po66
-rw-r--r--persian/po/mailinglists.fa.po6
-rw-r--r--persian/po/organization.fa.po164
-rw-r--r--persian/po/others.fa.po190
-rw-r--r--persian/po/partners.fa.po506
-rw-r--r--persian/po/ports.fa.po38
-rw-r--r--persian/po/stats.fa.po121
-rw-r--r--persian/po/templates.fa.po44
-rw-r--r--persian/po/vendors.fa.po32
-rw-r--r--polish/po/blends.pl.po38
-rw-r--r--polish/po/doc.pl.po560
-rw-r--r--polish/po/organization.pl.po192
-rw-r--r--polish/po/others.pl.po16
-rw-r--r--polish/po/partners.pl.po506
-rw-r--r--polish/po/stats.pl.po125
-rw-r--r--polish/po/templates.pl.po14
-rw-r--r--polish/po/vendors.pl.po32
-rw-r--r--portuguese/po/blends.pt.po54
-rw-r--r--portuguese/po/bugs.pt.po198
-rw-r--r--portuguese/po/distrib.pt.po64
-rw-r--r--portuguese/po/doc.pt.po622
-rw-r--r--portuguese/po/l10n.pt.po6
-rw-r--r--portuguese/po/mailinglists.pt.po6
-rw-r--r--portuguese/po/organization.pt.po306
-rw-r--r--portuguese/po/others.pt.po208
-rw-r--r--portuguese/po/partners.pt.po506
-rw-r--r--portuguese/po/ports.pt.po182
-rw-r--r--portuguese/po/stats.pt.po125
-rw-r--r--portuguese/po/templates.pt.po812
-rw-r--r--portuguese/po/vendors.pt.po102
-rw-r--r--romanian/po/blends.ro.po52
-rw-r--r--romanian/po/bugs.ro.po172
-rw-r--r--romanian/po/distrib.ro.po6
-rw-r--r--romanian/po/doc.ro.po656
-rw-r--r--romanian/po/l10n.ro.po6
-rw-r--r--romanian/po/mailinglists.ro.po10
-rw-r--r--romanian/po/organization.ro.po228
-rw-r--r--romanian/po/others.ro.po236
-rw-r--r--romanian/po/partners.ro.po506
-rw-r--r--romanian/po/ports.ro.po56
-rw-r--r--romanian/po/stats.ro.po125
-rw-r--r--romanian/po/templates.ro.po506
-rw-r--r--romanian/po/vendors.ro.po96
-rw-r--r--russian/po/blends.ru.po54
-rw-r--r--russian/po/distrib.ru.po24
-rw-r--r--russian/po/doc.ru.po841
-rw-r--r--russian/po/l10n.ru.po2
-rw-r--r--russian/po/mailinglists.ru.po6
-rw-r--r--russian/po/organization.ru.po228
-rw-r--r--russian/po/others.ru.po16
-rw-r--r--russian/po/partners.ru.po58
-rw-r--r--russian/po/ports.ru.po38
-rw-r--r--russian/po/stats.ru.po177
-rw-r--r--russian/po/templates.ru.po65
-rw-r--r--russian/po/vendors.ru.po40
-rw-r--r--slovak/po/blends.sk.po38
-rw-r--r--slovak/po/bugs.sk.po184
-rw-r--r--slovak/po/countries.sk.po1363
-rw-r--r--slovak/po/distrib.sk.po28
-rw-r--r--slovak/po/doc.sk.po101
-rw-r--r--slovak/po/mailinglists.sk.po6
-rw-r--r--slovak/po/newsevents.sk.po9
-rw-r--r--slovak/po/organization.sk.po267
-rw-r--r--slovak/po/others.sk.po16
-rw-r--r--slovak/po/partners.sk.po506
-rw-r--r--slovak/po/ports.sk.po38
-rw-r--r--slovak/po/stats.sk.po125
-rw-r--r--slovak/po/templates.sk.po556
-rw-r--r--slovak/po/vendors.sk.po32
-rw-r--r--slovak/po/vote.sk.po3
-rw-r--r--slovene/po/blends.sl.po38
-rw-r--r--slovene/po/bugs.sl.po104
-rw-r--r--slovene/po/countries.sl.po6
-rw-r--r--slovene/po/doc.sl.po82
-rw-r--r--slovene/po/l10n.sl.po6
-rw-r--r--slovene/po/organization.sl.po206
-rw-r--r--slovene/po/others.sl.po38
-rw-r--r--slovene/po/partners.sl.po506
-rw-r--r--slovene/po/stats.sl.po121
-rw-r--r--slovene/po/templates.sl.po508
-rw-r--r--spanish/po/blends.es.po6
-rw-r--r--spanish/po/bugs.es.po198
-rw-r--r--spanish/po/countries.es.po6
-rw-r--r--spanish/po/distrib.es.po64
-rw-r--r--spanish/po/doc.es.po623
-rw-r--r--spanish/po/l10n.es.po8
-rw-r--r--spanish/po/mailinglists.es.po6
-rw-r--r--spanish/po/organization.es.po162
-rw-r--r--spanish/po/others.es.po288
-rw-r--r--spanish/po/partners.es.po22
-rw-r--r--spanish/po/ports.es.po178
-rw-r--r--spanish/po/stats.es.po125
-rw-r--r--spanish/po/templates.es.po923
-rw-r--r--spanish/po/vendors.es.po40
-rw-r--r--swedish/po/blends.sv.po6
-rw-r--r--swedish/po/bugs.sv.po198
-rw-r--r--swedish/po/distrib.sv.po24
-rw-r--r--swedish/po/doc.sv.po593
-rw-r--r--swedish/po/mailinglists.sv.po6
-rw-r--r--swedish/po/organization.sv.po196
-rw-r--r--swedish/po/others.sv.po16
-rw-r--r--swedish/po/partners.sv.po20
-rw-r--r--swedish/po/ports.sv.po38
-rw-r--r--swedish/po/stats.sv.po125
-rw-r--r--swedish/po/templates.sv.po21
-rw-r--r--swedish/po/vendors.sv.po94
-rw-r--r--tamil/po/blends.ta.po38
-rw-r--r--tamil/po/bugs.ta.po198
-rw-r--r--tamil/po/distrib.ta.po6
-rw-r--r--tamil/po/doc.ta.po66
-rw-r--r--tamil/po/mailinglists.ta.po6
-rw-r--r--tamil/po/organization.ta.po263
-rw-r--r--[-rwxr-xr-x]tamil/po/others.ta.po192
-rw-r--r--tamil/po/partners.ta.po506
-rw-r--r--[-rwxr-xr-x]tamil/po/ports.ta.po38
-rw-r--r--tamil/po/stats.ta.po121
-rw-r--r--tamil/po/templates.ta.po800
-rw-r--r--tamil/po/vendors.ta.po32
-rw-r--r--turkish/po/blends.tr.po38
-rw-r--r--turkish/po/doc.tr.po84
-rw-r--r--turkish/po/organization.tr.po245
-rw-r--r--turkish/po/others.tr.po210
-rw-r--r--turkish/po/partners.tr.po506
-rw-r--r--turkish/po/ports.tr.po170
-rw-r--r--turkish/po/stats.tr.po121
-rw-r--r--turkish/po/templates.tr.po718
-rw-r--r--turkish/po/vendors.tr.po88
-rw-r--r--ukrainian/po/blends.uk.po46
-rw-r--r--ukrainian/po/bugs.uk.po196
-rw-r--r--ukrainian/po/consultants.uk.po3
-rw-r--r--ukrainian/po/distrib.uk.po46
-rw-r--r--ukrainian/po/doc.uk.po63
-rw-r--r--ukrainian/po/l10n.uk.po6
-rw-r--r--ukrainian/po/newsevents.uk.po1
-rw-r--r--ukrainian/po/organization.uk.po250
-rw-r--r--ukrainian/po/others.uk.po4
-rw-r--r--ukrainian/po/partners.uk.po512
-rw-r--r--ukrainian/po/ports.uk.po38
-rw-r--r--ukrainian/po/stats.uk.po125
-rw-r--r--ukrainian/po/templates.uk.po648
-rw-r--r--ukrainian/po/vendors.uk.po100
-rw-r--r--ukrainian/po/wnpp.uk.po11
-rw-r--r--vietnamese/po/blends.vi.po38
-rw-r--r--vietnamese/po/doc.vi.po60
-rw-r--r--vietnamese/po/mailinglists.vi.po6
-rw-r--r--vietnamese/po/organization.vi.po192
-rw-r--r--vietnamese/po/partners.vi.po506
-rw-r--r--vietnamese/po/stats.vi.po121
-rw-r--r--vietnamese/po/templates.vi.po14
-rw-r--r--vietnamese/po/vendors.vi.po44
411 files changed, 33445 insertions, 32019 deletions
diff --git a/albanian/po/doc.sq.po b/albanian/po/doc.sq.po
index f21bc981123..5e142d301f5 100644
--- a/albanian/po/doc.sq.po
+++ b/albanian/po/doc.sq.po
@@ -145,10 +145,10 @@ msgstr ""
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -173,12 +173,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
diff --git a/albanian/po/organization.sq.po b/albanian/po/organization.sq.po
index 6d79c37415f..8d10c3e95bd 100644
--- a/albanian/po/organization.sq.po
+++ b/albanian/po/organization.sq.po
@@ -65,22 +65,22 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr ""
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr ""
@@ -97,278 +97,278 @@ msgstr ""
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr ""
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr ""
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr ""
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:412
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr ""
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
"contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:440
+#: ../../english/intro/organization.data:444
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
msgid "Salsa administrators"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:466
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:469
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:472
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:485
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
-#: ../../english/intro/organization.data:488
+#: ../../english/intro/organization.data:492
msgid "Debian for astronomy"
msgstr ""
diff --git a/albanian/po/stats.sq.po b/albanian/po/stats.sq.po
index 66e8ca36b7e..ddc3a7cad51 100644
--- a/albanian/po/stats.sq.po
+++ b/albanian/po/stats.sq.po
@@ -19,208 +19,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/albanian/po/templates.sq.po b/albanian/po/templates.sq.po
index 6e51220570c..639e1093a0e 100644
--- a/albanian/po/templates.sq.po
+++ b/albanian/po/templates.sq.po
@@ -183,11 +183,11 @@ msgstr ""
#. your language.
#: ../../english/template/debian/footer.wml:105
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
#: ../../english/template/debian/footer.wml:108
@@ -472,6 +472,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr ""
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr ""
diff --git a/arabic/po/blends.ar.po b/arabic/po/blends.ar.po
index 64b8c15bf29..b00934651af 100644
--- a/arabic/po/blends.ar.po
+++ b/arabic/po/blends.ar.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/arabic/po/doc.ar.po b/arabic/po/doc.ar.po
index 4ee085c6351..df1071e24c9 100644
--- a/arabic/po/doc.ar.po
+++ b/arabic/po/doc.ar.po
@@ -30,8 +30,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -55,31 +55,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -91,7 +67,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -103,7 +79,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -111,6 +87,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "المؤلف:"
@@ -163,10 +155,10 @@ msgstr ""
msgid "plain text"
msgstr "نص صِرف"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -191,12 +183,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
diff --git a/arabic/po/organization.ar.po b/arabic/po/organization.ar.po
index 3cc71810bd7..7174b1e1382 100644
--- a/arabic/po/organization.ar.po
+++ b/arabic/po/organization.ar.po
@@ -80,24 +80,24 @@ msgid "Officers"
msgstr "أعضاء"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "توزيعة"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "الدعاية والإعلان"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "دعم فني وبنية تحتية"
@@ -114,211 +114,211 @@ msgstr "قائد"
msgid "Technical Committee"
msgstr "اللجنة التقنية"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "أمين عام"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "مشاريع التطوير"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "أرشيف FTP "
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "مساعد FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "حزم منفردة"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "إدارة الإصدارات"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "ضمان الجودة"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "فريق نظام التثبيت"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "ملاحظات الإصدارة"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "ملفات قرص مدمج"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "الإنتاج"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "اختبار"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "التوثيق"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "قائمة الحزم التي هي بحاجة إلى مزيد من العمل والمتوقعة"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "تحويلات"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "إعدادات خاصة"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "الحواسب المحمولة"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "الجدران النارية"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "الأجهزة المدمجة"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "جهة الإتصال الصحفي"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "صفحات الإنترنت"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "أحداث"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "اللجنة التقنية"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "برامج الشراكة"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "تنسيق التبرعات بالعتاد والأجهزة"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "دعم المستخدم"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "نظام تتبع العلاّت"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "مدراء حسابات دبيان"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "مشرفو مفاتيح التشفير PGP و GPG"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "الفريق الأمني"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "صفحة المستشارين"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "صفحة موزعي الأقراص المدمجة"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "سياسة"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "إدارة النظام"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -327,7 +327,7 @@ msgstr ""
"دبيان، وهذا يشمل المشاكل مع الدخول وكلمة السر، والحصول على حزمة معينة "
"للتثبيت."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -337,61 +337,73 @@ msgstr ""
"db.debian.org/machines.cgi\">أجهزة دبيان</a> للحصول على معلومات الإتصال "
"الخاصة بالمدير المسؤول عن الجهاز."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "مدير دليل LDAP لمعلومات المطورين"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "المرايا"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "مشرف ال DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "نظام تتبع الحزم"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "مدراء اولاين"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "مدراء اولاين"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "ديبيان للأطفال من سنة الى 99 سنوات"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "دبيان للأغراض الطبية والبحث الطبي"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "دبيان للتعليم"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "دبيان في المكاتب القانونية"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "دبيان لدوي الاحتياجات الخاصة"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
-#~ msgid "Publicity"
-#~ msgstr "الدعاية والإعلان"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "دبيان للتعليم"
#~ msgid "Security Audit Project"
#~ msgstr "مشروع التدقيق الأمني"
+
+#~ msgid "Publicity"
+#~ msgstr "الدعاية والإعلان"
diff --git a/arabic/po/others.ar.po b/arabic/po/others.ar.po
index 020d3f1abec..0dee108f385 100644
--- a/arabic/po/others.ar.po
+++ b/arabic/po/others.ar.po
@@ -333,17 +333,17 @@ msgstr "الإصدار"
msgid "URL"
msgstr "المسار"
-#~ msgid "Wanted:"
-#~ msgstr "مطلوب:"
+#~ msgid "Where:"
+#~ msgstr "أين:"
-#~ msgid "Who:"
-#~ msgstr "من:"
+#~ msgid "Specifications:"
+#~ msgstr "المواصفات:"
#~ msgid "Architecture:"
#~ msgstr "الهندسة:"
-#~ msgid "Specifications:"
-#~ msgstr "المواصفات:"
+#~ msgid "Who:"
+#~ msgstr "من:"
-#~ msgid "Where:"
-#~ msgstr "أين:"
+#~ msgid "Wanted:"
+#~ msgstr "مطلوب:"
diff --git a/arabic/po/partners.ar.po b/arabic/po/partners.ar.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/arabic/po/partners.ar.po
+++ b/arabic/po/partners.ar.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/arabic/po/ports.ar.po b/arabic/po/ports.ar.po
index 3284047ccc1..b6505ea9908 100644
--- a/arabic/po/ports.ar.po
+++ b/arabic/po/ports.ar.po
@@ -122,68 +122,65 @@ msgstr "دبيان لأنظمة PowerPC"
msgid "Debian for Sparc"
msgstr "دبيان لأنظمة Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "دبيان لأنظمة Sparc64"
+#~ msgid "Debian for Laptops"
+#~ msgstr "دبيان للحواسيب المحمولة"
-#~ msgid "Debian for S/390"
-#~ msgstr "دبيان لأنظمة S/390"
+#~ msgid "Debian for AMD64"
+#~ msgstr "دبيان لأنظمة AMD64"
-#~ msgid "Debian for MIPS"
-#~ msgstr "ديبيان لأنظمة MIPS"
+#~ msgid "Debian for ARM"
+#~ msgstr "دبيان لأنظمة ARM"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "دبيان لأنظمة Beowulf"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgid "Main"
+#~ msgstr "رئيسي"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "دبيان غنو/FreeBSD"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "دبيان لأنظمة موتورولا 680x0"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 cache on die"
+#~ msgid "Vendor/Name"
+#~ msgstr "البائع/الاسم"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bit external bus, external L2 cache"
+#~ msgid "Date announced"
+#~ msgstr "تاريخ الإعلان"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bit external bus"
+#~ msgid "Clock"
+#~ msgstr "ساعة"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bit external bus"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "Specials"
+#~ msgstr "الأشياء الخاصة"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "No FPU (R2010), external caches"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "No FPU (R3010)"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgid "External L1 cache"
+#~ msgstr "External L1 cache"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "وحدة معالجة مركزية (CPU) متعددة الرقاقات"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -192,62 +189,65 @@ msgstr "دبيان لأنظمة Sparc"
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
#~ "I2C, Watchdog"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "وحدة معالجة مركزية (CPU) متعددة الرقاقات"
-
-#~ msgid "External L1 cache"
-#~ msgstr "External L1 cache"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "No FPU (R3010)"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "No FPU (R2010), external caches"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "Specials"
-#~ msgstr "الأشياء الخاصة"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bit external bus"
-#~ msgid "Clock"
-#~ msgstr "ساعة"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bit external bus"
-#~ msgid "Date announced"
-#~ msgstr "تاريخ الإعلان"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bit external bus, external L2 cache"
-#~ msgid "Vendor/Name"
-#~ msgstr "البائع/الاسم"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 cache on die"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "دبيان لأنظمة موتورولا 680x0"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "دبيان غنو/FreeBSD"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgid "Main"
-#~ msgstr "رئيسي"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "دبيان لأنظمة Beowulf"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
-#~ msgid "Debian for ARM"
-#~ msgstr "دبيان لأنظمة ARM"
+#~ msgid "Debian for MIPS"
+#~ msgstr "ديبيان لأنظمة MIPS"
-#~ msgid "Debian for AMD64"
-#~ msgstr "دبيان لأنظمة AMD64"
+#~ msgid "Debian for S/390"
+#~ msgstr "دبيان لأنظمة S/390"
-#~ msgid "Debian for Laptops"
-#~ msgstr "دبيان للحواسيب المحمولة"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "دبيان لأنظمة Sparc64"
diff --git a/arabic/po/stats.ar.po b/arabic/po/stats.ar.po
index ed1bed298c3..bbb9955ceb7 100644
--- a/arabic/po/stats.ar.po
+++ b/arabic/po/stats.ar.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "الملفات"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "الملف"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "السِجل"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "المترجم"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/arabic/po/templates.ar.po b/arabic/po/templates.ar.po
index 341531d0050..2a783804b6d 100644
--- a/arabic/po/templates.ar.po
+++ b/arabic/po/templates.ar.po
@@ -160,8 +160,8 @@ msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
"to our <a href=\"mailto:debian-doc@lists.debian.org\">mailing list</a>."
msgstr ""
-"يرجى إرسال التعليقات، والانتقادات والاقتراحات حول صفحات الوِب هذه إلى <a "
-"href=\"mailto:debian-doc@lists.debian.org\">قائمتنا البريدية</a>."
+"يرجى إرسال التعليقات، والانتقادات والاقتراحات حول صفحات الوِب هذه إلى <a href="
+"\"mailto:debian-doc@lists.debian.org\">قائمتنا البريدية</a>."
#: ../../english/template/debian/fixes_link.wml:11
msgid "not needed"
@@ -201,23 +201,24 @@ msgstr "في الإصدار 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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>."
+#| "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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
-"للتبليغ عن مشكل في الموقع، راسل <a href=\"mailto:debian-www@lists.debian."
-"org\">debian-www@lists.debian.org</a>. للحصول على معلومات الاتصال الأخرى، "
-"راجع <a href=\"m4_HOME/contact\">صفحة المراسلة</a>. الكود المصدري للموقع <a "
-"href=\"m4_HOME/devel/website/using_cvs\">متوفر</a>."
+"للتبليغ عن مشكل في الموقع، راسل <a href=\"mailto:debian-www@lists.debian.org"
+"\">debian-www@lists.debian.org</a>. للحصول على معلومات الاتصال الأخرى، راجع "
+"<a href=\"m4_HOME/contact\">صفحة المراسلة</a>. الكود المصدري للموقع <a href="
+"\"m4_HOME/devel/website/using_cvs\">متوفر</a>."
#: ../../english/template/debian/footer.wml:108
msgid "Last Modified"
@@ -505,6 +506,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>ملاحظة :</em> المستند الأصلي لهذه الترجمة لم يعد موجودا."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "مسار"
diff --git a/arabic/po/vendors.ar.po b/arabic/po/vendors.ar.po
index 89f9d590822..79f0a9fca70 100644
--- a/arabic/po/vendors.ar.po
+++ b/arabic/po/vendors.ar.po
@@ -71,29 +71,29 @@ msgstr "مصدر"
msgid "and"
msgstr "و"
-#~ msgid "Vendor:"
-#~ msgstr "المصنّع:"
+#~ msgid "Architectures:"
+#~ msgstr "البُنى:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "مسار صفحة دبيان:"
+#~ msgid "DVD Type:"
+#~ msgstr "نوع قرص DVD:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "يسمح التبرّع لدبيان:"
+#~ msgid "CD Type:"
+#~ msgstr "نوع القرص المدمج:"
-#~ msgid "Country:"
-#~ msgstr "البلد:"
+#~ msgid "email:"
+#~ msgstr "البريد الإلكتروني:"
#~ msgid "Ship International:"
#~ msgstr "الشحن الدولي:"
-#~ msgid "email:"
-#~ msgstr "البريد الإلكتروني:"
+#~ msgid "Country:"
+#~ msgstr "البلد:"
-#~ msgid "CD Type:"
-#~ msgstr "نوع القرص المدمج:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "يسمح التبرّع لدبيان:"
-#~ msgid "DVD Type:"
-#~ msgstr "نوع قرص DVD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "مسار صفحة دبيان:"
-#~ msgid "Architectures:"
-#~ msgstr "البُنى:"
+#~ msgid "Vendor:"
+#~ msgstr "المصنّع:"
diff --git a/armenian/po/blends.hy.po b/armenian/po/blends.hy.po
index 64b8c15bf29..b00934651af 100644
--- a/armenian/po/blends.hy.po
+++ b/armenian/po/blends.hy.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/armenian/po/distrib.hy.po b/armenian/po/distrib.hy.po
index 16bde2aced0..53a6447d228 100644
--- a/armenian/po/distrib.hy.po
+++ b/armenian/po/distrib.hy.po
@@ -201,14 +201,14 @@ msgstr ""
msgid "SPARC"
msgstr ""
-#~ msgid "all files in this package"
-#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
-
-#~ msgid "no"
-#~ msgstr "ոչ"
+#~ msgid "non-US"
+#~ msgstr "ոչ-US"
#~ msgid "yes"
#~ msgstr "այո"
-#~ msgid "non-US"
-#~ msgstr "ոչ-US"
+#~ msgid "no"
+#~ msgstr "ոչ"
+
+#~ msgid "all files in this package"
+#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
diff --git a/armenian/po/doc.hy.po b/armenian/po/doc.hy.po
index 064eca133a5..418ec72314d 100644
--- a/armenian/po/doc.hy.po
+++ b/armenian/po/doc.hy.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -87,7 +63,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -107,6 +83,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Հեղինակ՝"
@@ -159,10 +151,10 @@ msgstr ""
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -187,12 +179,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
diff --git a/armenian/po/organization.hy.po b/armenian/po/organization.hy.po
index 9e33b2c5e79..4122e3348cb 100644
--- a/armenian/po/organization.hy.po
+++ b/armenian/po/organization.hy.po
@@ -71,22 +71,22 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr ""
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr ""
@@ -103,270 +103,278 @@ msgstr ""
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr ""
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr ""
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr ""
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr ""
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
"contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+msgid "Salsa administrators"
+msgstr ""
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
+
+#: ../../english/intro/organization.data:492
+msgid "Debian for astronomy"
+msgstr ""
diff --git a/armenian/po/partners.hy.po b/armenian/po/partners.hy.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/armenian/po/partners.hy.po
+++ b/armenian/po/partners.hy.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/armenian/po/stats.hy.po b/armenian/po/stats.hy.po
index a9c6244cffb..1d4a98a84f8 100644
--- a/armenian/po/stats.hy.po
+++ b/armenian/po/stats.hy.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/armenian/po/templates.hy.po b/armenian/po/templates.hy.po
index 09eb77a30c7..b87178d31db 100644
--- a/armenian/po/templates.hy.po
+++ b/armenian/po/templates.hy.po
@@ -189,11 +189,11 @@ msgstr ""
#. your language.
#: ../../english/template/debian/footer.wml:105
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
#: ../../english/template/debian/footer.wml:108
@@ -478,6 +478,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr ""
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr ""
diff --git a/armenian/po/vendors.hy.po b/armenian/po/vendors.hy.po
index 7c6a1b5395a..2238c62055c 100644
--- a/armenian/po/vendors.hy.po
+++ b/armenian/po/vendors.hy.po
@@ -68,29 +68,29 @@ msgstr ""
msgid "and"
msgstr ""
-#~ msgid "Vendor:"
-#~ msgstr "Մատակարարող՝"
+#~ msgid "Vendor Release"
+#~ msgstr "Մատակարարողի "
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Debian-ի հասցեն՝"
+#~ msgid "Architectures:"
+#~ msgstr "Համակառույցները՝"
-#~ msgid "Country:"
-#~ msgstr "Երկիր՝"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD տիպը՝"
-#~ msgid "Ship International:"
-#~ msgstr "Առաքում այլ երկրներ՝"
+#~ msgid "CD Type:"
+#~ msgstr "CD տիպը՝"
#~ msgid "email:"
#~ msgstr "էլ-փոստ՝"
-#~ msgid "CD Type:"
-#~ msgstr "CD տիպը՝"
+#~ msgid "Ship International:"
+#~ msgstr "Առաքում այլ երկրներ՝"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD տիպը՝"
+#~ msgid "Country:"
+#~ msgstr "Երկիր՝"
-#~ msgid "Architectures:"
-#~ msgstr "Համակառույցները՝"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-ի հասցեն՝"
-#~ msgid "Vendor Release"
-#~ msgstr "Մատակարարողի "
+#~ msgid "Vendor:"
+#~ msgstr "Մատակարարող՝"
diff --git a/bulgarian/po/blends.bg.po b/bulgarian/po/blends.bg.po
index 64b8c15bf29..b00934651af 100644
--- a/bulgarian/po/blends.bg.po
+++ b/bulgarian/po/blends.bg.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/bulgarian/po/bugs.bg.po b/bulgarian/po/bugs.bg.po
index 4cebf2b1eb4..340ec7ab2d6 100644
--- a/bulgarian/po/bugs.bg.po
+++ b/bulgarian/po/bugs.bg.po
@@ -160,152 +160,152 @@ msgstr "Архивирани"
msgid "Archived and Unarchived"
msgstr "Активни и архивирани"
-#~ msgid "Exclude tag:"
-#~ msgstr "Изключване на етикет:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Включване на етикет:"
+#~ msgid "Flags:"
+#~ msgstr "Флагове"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "активни доклади"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "показване на слетите доклади само веднъж"
-#~ msgid "wontfix"
-#~ msgstr "отхвърлен"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "без подреждане по на статус или важност"
-#~ msgid "upstream"
-#~ msgstr "авторски"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "скриване на съдържанието в антетката"
-#~ msgid "unreproducible"
-#~ msgstr "невъзпроизводим"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "скриване на статистиките в края на страницата"
-#~ msgid "security"
-#~ msgstr "сигурност"
+#~ msgid "proposed-updates"
+#~ msgstr "предложени обновления"
-#~ msgid "patch"
-#~ msgstr "кръпка"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "предлагани обновления за тестовата дистрибуция"
-#~ msgid "moreinfo"
-#~ msgstr "повече информация"
+#~ msgid "Package version:"
+#~ msgstr "Версия на пакета:"
-#~ msgid "l10n"
-#~ msgstr "локализация"
+#~ msgid "Distribution:"
+#~ msgstr "Дистрибуция:"
-#~ msgid "help"
-#~ msgstr "помощ"
+#~ msgid "bugs"
+#~ msgstr "доклади"
-#~ msgid "fixed-upstream"
-#~ msgstr "поправен от автора"
+#~ msgid "open"
+#~ msgstr "отворен"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "поправен в експерименталната дистрибуция"
+#~ msgid "forwarded"
+#~ msgstr "препратен"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "чакащ"
-#~ msgid "confirmed"
-#~ msgstr "потвърден"
+#~ msgid "fixed"
+#~ msgstr "поправен"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "приключен"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Включване на статус:"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Изключване на статус:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "критичен"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "много сериозен"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "сериозен"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "важен"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "незначителен"
-#~ msgid "Exclude severity:"
-#~ msgstr "Изключване на важност:"
+#~ msgid "wishlist"
+#~ msgstr "пожелание"
#~ msgid "Include severity:"
#~ msgstr "Включване на важност:"
-#~ msgid "wishlist"
-#~ msgstr "пожелание"
+#~ msgid "Exclude severity:"
+#~ msgstr "Изключване на важност:"
-#~ msgid "minor"
-#~ msgstr "незначителен"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "important"
-#~ msgstr "важен"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "serious"
-#~ msgstr "сериозен"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "grave"
-#~ msgstr "много сериозен"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "critical"
-#~ msgstr "критичен"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Изключване на статус:"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "Include status:"
-#~ msgstr "Включване на статус:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "done"
-#~ msgstr "приключен"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "поправен"
+#~ msgid "confirmed"
+#~ msgstr "потвърден"
-#~ msgid "pending"
-#~ msgstr "чакащ"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "препратен"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "поправен в експерименталната дистрибуция"
-#~ msgid "open"
-#~ msgstr "отворен"
+#~ msgid "fixed-upstream"
+#~ msgstr "поправен от автора"
-#~ msgid "bugs"
-#~ msgstr "доклади"
+#~ msgid "help"
+#~ msgstr "помощ"
-#~ msgid "Distribution:"
-#~ msgstr "Дистрибуция:"
+#~ msgid "l10n"
+#~ msgstr "локализация"
-#~ msgid "Package version:"
-#~ msgstr "Версия на пакета:"
+#~ msgid "moreinfo"
+#~ msgstr "повече информация"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "предлагани обновления за тестовата дистрибуция"
+#~ msgid "patch"
+#~ msgstr "кръпка"
-#~ msgid "proposed-updates"
-#~ msgstr "предложени обновления"
+#~ msgid "security"
+#~ msgstr "сигурност"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "скриване на статистиките в края на страницата"
+#~ msgid "unreproducible"
+#~ msgstr "невъзпроизводим"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "скриване на съдържанието в антетката"
+#~ msgid "upstream"
+#~ msgstr "авторски"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "без подреждане по на статус или важност"
+#~ msgid "wontfix"
+#~ msgstr "отхвърлен"
-#~ msgid "display merged bugs only once"
-#~ msgstr "показване на слетите доклади само веднъж"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "активни доклади"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Флагове"
+#~ msgid "Include tag:"
+#~ msgstr "Включване на етикет:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Изключване на етикет:"
diff --git a/bulgarian/po/distrib.bg.po b/bulgarian/po/distrib.bg.po
index 7cbbb185df2..58c059a36ac 100644
--- a/bulgarian/po/distrib.bg.po
+++ b/bulgarian/po/distrib.bg.po
@@ -214,23 +214,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/bulgarian/po/doc.bg.po b/bulgarian/po/doc.bg.po
index 10aeb40fa9b..156ba8650d7 100644
--- a/bulgarian/po/doc.bg.po
+++ b/bulgarian/po/doc.bg.po
@@ -32,8 +32,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
#, fuzzy
#| msgid ""
#| "Written by two Debian developers, this free book\n"
@@ -88,31 +88,7 @@ msgstr ""
"широк кръг от проблеми за потребители, които сами си инсталират и поддържат "
"операционната система в дома, офиса, клуба или учебното заведение."
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Дебиан 2.2 за архитектура ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -124,7 +100,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -136,7 +112,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
#, fuzzy
#| msgid ""
#| "This book teaches you how to install and configure the system and also "
@@ -155,6 +131,22 @@ msgstr ""
"пълния потенциал на дистрибуцията (версия 6.0) и предлага практическо "
"ръководство за всички потребители, които искат да научат повече за Дебиан."
+#: ../../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 "Автор:"
@@ -207,10 +199,10 @@ msgstr "(версия <get-var version />)"
msgid "plain text"
msgstr "обикновен текст"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -235,12 +227,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -271,18 +257,35 @@ msgstr ""
msgid "PDF"
msgstr ""
-#~ msgid "Language:"
-#~ msgstr "Език:"
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "Инсталатор за sarge с набор от пакети"
+
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Жив компактдиск с Knoppix"
#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Използвайте <a href=\"cvs\">SVN</a> за да изтеглите изходния код (SGML) "
-#~ "на <get-var ddp_pkg_loc />."
+#~ "Начинаещи и напреднали потребители ще открият в тази книга богата\n"
+#~ " информация за употребата на Дебиан като операционна система за\n"
+#~ " работни станции, сървъри за Интернет и интранет и разработка.\n"
+#~ " Включена е и информация за проекта, както и подробно описание на\n"
+#~ " уникалната система за управление на пакети на Дебиан."
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Инсталатор на Дебиан ГНУ/Линукс 3.1 sarge"
+#~ msgid "Debian 2.1"
+#~ msgstr "Дебиан 2.1"
+
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD с Дебиан squeeze за 32-битови и 64-битови персонални компютри"
+
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr ""
+#~ "2 варианта: единият без диск, другият с два диска DVD за 32-битови "
+#~ "персонални компютри"
#~ msgid ""
#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
@@ -292,32 +295,18 @@ msgstr ""
#~ "битови персонални компютри, включително раздела contrib и изходните "
#~ "кодове."
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr ""
-#~ "2 варианта: единият без диск, другият с два диска DVD за 32-битови "
-#~ "персонални компютри"
-
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD с Дебиан squeeze за 32-битови и 64-битови персонални компютри"
-
-#~ msgid "Debian 2.1"
-#~ msgstr "Дебиан 2.1"
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Инсталатор на Дебиан ГНУ/Линукс 3.1 sarge"
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
#~ msgstr ""
-#~ "Начинаещи и напреднали потребители ще открият в тази книга богата\n"
-#~ " информация за употребата на Дебиан като операционна система за\n"
-#~ " работни станции, сървъри за Интернет и интранет и разработка.\n"
-#~ " Включена е и информация за проекта, както и подробно описание на\n"
-#~ " уникалната система за управление на пакети на Дебиан."
+#~ "Използвайте <a href=\"cvs\">SVN</a> за да изтеглите изходния код (SGML) "
+#~ "на <get-var ddp_pkg_loc />."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Жив компактдиск с Knoppix"
+#~ msgid "Language:"
+#~ msgstr "Език:"
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "Инсталатор за sarge с набор от пакети"
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Дебиан 2.2 за архитектура ARM"
diff --git a/bulgarian/po/l10n.bg.po b/bulgarian/po/l10n.bg.po
index 3fb0d38b174..e8f452c7b65 100644
--- a/bulgarian/po/l10n.bg.po
+++ b/bulgarian/po/l10n.bg.po
@@ -97,8 +97,8 @@ msgstr "POT файлове"
msgid "Hints for translators"
msgstr "Съвети за преводачи"
-#~ msgid "Original templates"
-#~ msgstr "Оригинални шаблони"
-
#~ msgid "Translated templates"
#~ msgstr "Преведени шаблони"
+
+#~ msgid "Original templates"
+#~ msgstr "Оригинални шаблони"
diff --git a/bulgarian/po/mailinglists.bg.po b/bulgarian/po/mailinglists.bg.po
index 043a2aa849b..28f19972ff9 100644
--- a/bulgarian/po/mailinglists.bg.po
+++ b/bulgarian/po/mailinglists.bg.po
@@ -129,8 +129,8 @@ msgstr "отворен"
msgid "closed"
msgstr "затворен"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Изберете за кои списъци желаете да се абонирате:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Изберете от кои списъци желаете да се отпишете:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Изберете за кои списъци желаете да се абонирате:"
diff --git a/bulgarian/po/organization.bg.po b/bulgarian/po/organization.bg.po
index b5e2607cfcc..6622b95cf3b 100644
--- a/bulgarian/po/organization.bg.po
+++ b/bulgarian/po/organization.bg.po
@@ -77,24 +77,24 @@ msgid "Officers"
msgstr "Официални длъжности"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Дистрибуция"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Публичност"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Поддръжка и инфраструктура"
@@ -111,211 +111,211 @@ msgstr "Лидер"
msgid "Technical Committee"
msgstr "Техническа комисия"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Секретар"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Разработка"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP архиви"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Магьосник на FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Асистенти"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Магьосници на FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Обновени пакети за стабилното издание"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Екип за поддържане на обновените пакети за стабилното издание"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Отделни пакети"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Управление на изданията"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Екип по изданията"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Контрол на качеството"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Екип по инсталационната система"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Бележки по изданията"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Образи на компактдискове"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Производство"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Тестване"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Инфраструктура за автоматично компилиране на пакети"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Екип на wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Администриране на buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Документация"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Списък на незавършени и планирани пакети"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Екип на живата система"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Архитектури"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Специални конфигурации"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Преносими компютри"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Защитни стени"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Системи за вграждане"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Контакт с пресата"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Уеб-страници"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Планета Дебиан"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Проект Жени в Дебиан"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Без тормоз"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Събития"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Техническа комисия"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Партньоркса програма"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Координация на хардуерни дарения"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Поддръжка за потребители"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Система за следене на грешки"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Администрация и архив на пощенските списъци"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Портал за кандидат-членове"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Администратори на членството в проекта"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Отговорници за ключодържателите (PGP и GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Екип по сигурността"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Страница на консултантите"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Страница на търговците на компактдискове"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Правилник"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Системна администрация"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -323,7 +323,7 @@ msgstr ""
"Това е адресът, на който да съобщите при проблеми с някоя от машините на "
"Дебиан, включително проблеми с паролата или липса на пакети."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -333,27 +333,27 @@ msgstr ""
"страницата <a href=\"https://db.debian.org/machines.cgi\">Машини на Дебиан</"
"a>, която може да съдържа информация за администратора на конкретната машина."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Администратор на директорията на разработчиците в LDAP"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Огледални сървъри"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Отговорник за DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Система за следене на пакетите"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Одитор"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
#, fuzzy
#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgid ""
@@ -362,66 +362,84 @@ msgstr ""
"запитвания за използването на <a href=\"m4_HOME/trademark\">търговските "
"марки</a>"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Администратори на Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Администратори на Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Дебиан за деца от 1 до 99г."
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Дебиан за медицински практики и разработки"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Дебиан за образователни цели"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Дебиан за правни кантори"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Дебиан за хора с увреждания"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Дебиан за научни изследвания"
-#~ msgid "Publicity"
-#~ msgstr "Публичност"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Дебиан за образователни цели"
-#~ msgid "Bits from Debian"
-#~ msgstr "Кратки новини за Дебиан"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "текущ лидер на проекта"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Отговорници за ключодържателите (DM)"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Отговорници за програмата „Програмиране през лятото 2013“"
-#~ msgid "DebConf chairs"
-#~ msgstr "Ръководство на ДебКонф"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Неактивна, не е част от изданието squeeze)"
-#~ msgid "Testing Security Team"
-#~ msgstr "Екип по сигурността на тестовата дистрибуция"
+#~ msgid "Handhelds"
+#~ msgstr "Джобни компютри"
-#~ msgid "Security Audit Project"
-#~ msgstr "Проект за одит на сигурността"
+#~ msgid "Marketing Team"
+#~ msgstr "Маркетингов екип"
-#~ msgid "Volatile Team"
-#~ msgstr "Екип на volatile"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Координация на подписване на ключовете"
-#~ msgid "Vendors"
-#~ msgstr "Търговци"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Специализирани дистрибуции"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Дебиан за организации с идеална цел"
+#~ msgid "Release Managers for ``stable''"
+#~ msgstr "Управители на стабилните идания"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Универсалната операционна система"
+#~ msgid "Release Assistants"
+#~ msgstr "Асистенти"
-#~ msgid "Accountant"
-#~ msgstr "Счетоводител"
+#~ msgid "APT Team"
+#~ msgstr "Екип APT"
+
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Администраторите отговорни за buildd на дадена архитектура могат да бъдат "
+#~ "открити на <genericemail архитекрура@buildd.debian.org>, например "
+#~ "<genericemail i386@buildd.debian.org>."
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -433,41 +451,41 @@ msgstr "Дебиан за научни изследвания"
#~ "артхитектура и дистрибуция за да видите наличните buildd и техните "
#~ "администратори."
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Администраторите отговорни за buildd на дадена архитектура могат да бъдат "
-#~ "открити на <genericemail архитекрура@buildd.debian.org>, например "
-#~ "<genericemail i386@buildd.debian.org>."
+#~ msgid "Accountant"
+#~ msgstr "Счетоводител"
-#~ msgid "APT Team"
-#~ msgstr "Екип APT"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Универсалната операционна система"
-#~ msgid "Release Assistants"
-#~ msgstr "Асистенти"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Дебиан за организации с идеална цел"
-#~ msgid "Release Managers for ``stable''"
-#~ msgstr "Управители на стабилните идания"
+#~ msgid "Vendors"
+#~ msgstr "Търговци"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Специализирани дистрибуции"
+#~ msgid "Volatile Team"
+#~ msgstr "Екип на volatile"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Координация на подписване на ключовете"
+#~ msgid "Security Audit Project"
+#~ msgstr "Проект за одит на сигурността"
-#~ msgid "Marketing Team"
-#~ msgstr "Маркетингов екип"
+#~ msgid "Testing Security Team"
+#~ msgstr "Екип по сигурността на тестовата дистрибуция"
-#~ msgid "Handhelds"
-#~ msgstr "Джобни компютри"
+#~ msgid "DebConf chairs"
+#~ msgstr "Ръководство на ДебКонф"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Неактивна, не е част от изданието squeeze)"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Отговорници за ключодържателите (DM)"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Отговорници за програмата „Програмиране през лятото 2013“"
+#~ msgid "Bits from Debian"
+#~ msgstr "Кратки новини за Дебиан"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "текущ лидер на проекта"
+#~ msgid "Publicity"
+#~ msgstr "Публичност"
+
+#~ msgid "Auditor"
+#~ msgstr "Одитор"
+
+#~ msgid "Live System Team"
+#~ msgstr "Екип на живата система"
diff --git a/bulgarian/po/others.bg.po b/bulgarian/po/others.bg.po
index 445789b39a6..67eb4c53885 100644
--- a/bulgarian/po/others.bg.po
+++ b/bulgarian/po/others.bg.po
@@ -330,66 +330,83 @@ msgstr "Версия"
msgid "URL"
msgstr "URL"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "Желани:"
-#~ msgid "Previous Talks:"
-#~ msgstr "Предишни разговори:"
+#~ msgid "Who:"
+#~ msgstr "Кой:"
-#~ msgid "Languages:"
-#~ msgstr "Езици:"
+#~ msgid "Architecture:"
+#~ msgstr "Архитектура:"
-#~ msgid "Location:"
-#~ msgstr "Локация:"
+#~ msgid "Specifications:"
+#~ msgstr "Спецификации:"
-#~ msgid "Topics:"
-#~ msgstr "Теми:"
+#~ msgid "Where:"
+#~ msgstr "Къде:"
-#~ msgid "closed"
-#~ msgstr "затворен"
+#~ msgid "Name:"
+#~ msgstr "Име:"
-#~ msgid "open"
-#~ msgstr "отворен"
+#~ msgid "Company:"
+#~ msgstr "Фирма:"
-#~ msgid "Unsubscribe"
-#~ msgstr "Отписване"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Моля изберете за кои списъци желаете да се отпишете:"
+#~ msgid "or"
+#~ msgstr "или"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Rates:"
+#~ msgstr "Рейтинг:"
+
+#~ msgid "Willing to Relocate"
+#~ msgstr "Желае да се премества"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Прочетете страницата за <a href=\"./#subunsub\">пощенски списъци</a> за "
-#~ "информация как да се отпишете от тях чрез e-mail. Достъпна е и <a href="
-#~ "\"unsubscribe\">web форма за абониране</a> за пощенски списъци"
+#~ "<total_consultant> Debian консултанти от <total_country> страни от цял "
+#~ "свят."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Отписване от пощенски списъци"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Абониране за пощенски списък"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
-#~ "Моля съобразявайте се с <a href=\"./#ads\">правилник за рекламиране в "
-#~ "пощенските списъци на Дебиан</a>."
+#~ "Прочетете страницата за <a href=\"./#subunsub\">пощенски списъци</a> за "
+#~ "информация как да се абонирате за тях чрез e-mail. Достъпна е и <a href="
+#~ "\"unsubscribe\">web форма за отписване</a> от пощенските списъци"
-#~ msgid "Clear"
-#~ msgstr "Изчистване"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "Имайте предвид, че повечето пощенски списъци на Debian са публични. Всеки "
+#~ "email изпратен до тях ще бъде публикуван в публичен пощенски архив и ще "
+#~ "бъде индексиран от търсещи машини. Затова използвайте email адрес, който "
+#~ "може да стане публично достояние."
-#~ msgid "Subscribe"
-#~ msgstr "Абониране"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Моля изберете за кои списъци желаете да се абонирате:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Вашият E-Mail адрес:"
+#~ msgid "No description given"
+#~ msgstr "Без описание"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "е само за четене, версия дайджест"
+#~ msgid "Moderated:"
+#~ msgstr "Модериран:"
-#~ msgid "Subscription:"
-#~ msgstr "Абониран:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Пускането на съобщения е разрешено само за абонирани."
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -397,80 +414,63 @@ msgstr "URL"
#~ "Само съобщения, подписани от Debian програмист ще бъдат приемани в този "
#~ "списък."
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Пускането на съобщения е разрешено само за абонирани."
+#~ msgid "Subscription:"
+#~ msgstr "Абониран:"
-#~ msgid "Moderated:"
-#~ msgstr "Модериран:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "е само за четене, версия дайджест"
-#~ msgid "No description given"
-#~ msgstr "Без описание"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Вашият E-Mail адрес:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Моля изберете за кои списъци желаете да се абонирате:"
+#~ msgid "Subscribe"
+#~ msgstr "Абониране"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Имайте предвид, че повечето пощенски списъци на Debian са публични. Всеки "
-#~ "email изпратен до тях ще бъде публикуван в публичен пощенски архив и ще "
-#~ "бъде индексиран от търсещи машини. Затова използвайте email адрес, който "
-#~ "може да стане публично достояние."
+#~ msgid "Clear"
+#~ msgstr "Изчистване"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Прочетете страницата за <a href=\"./#subunsub\">пощенски списъци</a> за "
-#~ "информация как да се абонирате за тях чрез e-mail. Достъпна е и <a href="
-#~ "\"unsubscribe\">web форма за отписване</a> от пощенските списъци"
+#~ "Моля съобразявайте се с <a href=\"./#ads\">правилник за рекламиране в "
+#~ "пощенските списъци на Дебиан</a>."
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Абониране за пощенски списък"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Отписване от пощенски списъци"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
-#~ "<total_consultant> Debian консултанти от <total_country> страни от цял "
-#~ "свят."
-
-#~ msgid "Willing to Relocate"
-#~ msgstr "Желае да се премества"
-
-#~ msgid "Rates:"
-#~ msgstr "Рейтинг:"
-
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#~ "Прочетете страницата за <a href=\"./#subunsub\">пощенски списъци</a> за "
+#~ "информация как да се отпишете от тях чрез e-mail. Достъпна е и <a href="
+#~ "\"unsubscribe\">web форма за абониране</a> за пощенски списъци"
-#~ msgid "or"
-#~ msgstr "или"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Моля изберете за кои списъци желаете да се отпишете:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Unsubscribe"
+#~ msgstr "Отписване"
-#~ msgid "Company:"
-#~ msgstr "Фирма:"
+#~ msgid "open"
+#~ msgstr "отворен"
-#~ msgid "Name:"
-#~ msgstr "Име:"
+#~ msgid "closed"
+#~ msgstr "затворен"
-#~ msgid "Where:"
-#~ msgstr "Къде:"
+#~ msgid "Topics:"
+#~ msgstr "Теми:"
-#~ msgid "Specifications:"
-#~ msgstr "Спецификации:"
+#~ msgid "Location:"
+#~ msgstr "Локация:"
-#~ msgid "Architecture:"
-#~ msgstr "Архитектура:"
+#~ msgid "Languages:"
+#~ msgstr "Езици:"
-#~ msgid "Who:"
-#~ msgstr "Кой:"
+#~ msgid "Previous Talks:"
+#~ msgstr "Предишни разговори:"
-#~ msgid "Wanted:"
-#~ msgstr "Желани:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
diff --git a/bulgarian/po/partners.bg.po b/bulgarian/po/partners.bg.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/bulgarian/po/partners.bg.po
+++ b/bulgarian/po/partners.bg.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/bulgarian/po/ports.bg.po b/bulgarian/po/ports.bg.po
index d6fc2dc55dd..688c34444f2 100644
--- a/bulgarian/po/ports.bg.po
+++ b/bulgarian/po/ports.bg.po
@@ -118,32 +118,32 @@ msgstr "Дебиан за PowerPC"
msgid "Debian for Sparc"
msgstr "Дебиан за Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Дебиан за Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Дебиан за S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Дебиан за преносими компютри"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Дебиан за MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Дебиан за AMD64"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Дебиан за Motorola 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "Дебиан за ARM"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Дебиан ГНУ/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Дебиан за Beowulf"
#~ msgid "Main"
#~ msgstr "Main"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Дебиан за Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Дебиан ГНУ/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "Дебиан за ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Дебиан за Motorola 680x0"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Дебиан за AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Дебиан за MIPS"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Дебиан за преносими компютри"
+#~ msgid "Debian for S/390"
+#~ msgstr "Дебиан за S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Дебиан за Sparc64"
diff --git a/bulgarian/po/stats.bg.po b/bulgarian/po/stats.bg.po
index 5ae5b21be50..060e7f4c63c 100644
--- a/bulgarian/po/stats.bg.po
+++ b/bulgarian/po/stats.bg.po
@@ -30,79 +30,90 @@ msgstr "Има %d байта за превод."
msgid "There are %d strings to translate."
msgstr "Има %d низа за превод."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Преводът е твърде стар"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Грешна версия на превода"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Преводът е твърде стар"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Оригиналният документ е променян след превода"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Оригиналният документ вече не съществува"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "не е наличен брой на попаденията"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "попадения"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Извличане на данни за разликите"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Разлики в стандартен формат"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Оцветени разлики"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Оцветени разлики"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Обобщена информация за превода на"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Няма превод"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Остарял"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Преведено"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Обновен"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "файла"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "байта"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -110,136 +121,136 @@ msgstr ""
"Забележка: списъкът на страниците е подреден по популярност. Поставете "
"мишката над името на страницата за да видите броя попадения."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Преводи, които имат нужда от обновяване"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Файл"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Разлики"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Бележка"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Обобщени разлики"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Журнал на промените"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Превод"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Отговорник"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Статус"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Преводач"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Дата"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Общи страници без превод"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Общи страници без превод"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Новини без превод"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Новини без превод"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Страници за консултанти и потребители без превод"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Страници за консултанти и потребители без превод"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Международни страници без превод"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Международни страници без превод"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Преведени страници (обновени)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Преведени низове (файлове PO)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Статистика на преведените низове (PO)"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Мъгяви"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Без превод"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Общо"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Общо:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Преведени страници"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Статистика на преводите по брой страници"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Език"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Преводи"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Преведени страници (по размер)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Статистика на преводите по размер на страниците"
-#~ msgid "Created with"
-#~ msgstr "Създаден с"
-
#~ msgid "Origin"
#~ msgstr "Оригинален документ"
+
+#~ msgid "Created with"
+#~ msgstr "Създаден с"
diff --git a/bulgarian/po/templates.bg.po b/bulgarian/po/templates.bg.po
index 827b3ffd4d2..a47961a6269 100644
--- a/bulgarian/po/templates.bg.po
+++ b/bulgarian/po/templates.bg.po
@@ -206,11 +206,11 @@ msgstr "във версия 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Ако сте открили проблем в сайта, пишете до <a href=\"mailto:debian-www@lists."
"debian.org\">debian-www@lists.debian.org</a> (на английски). Ако желаете да "
@@ -509,6 +509,10 @@ msgid ""
msgstr ""
"<em>Бележка:</em> Оригиналния документ на този превод вече не съществува."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -517,549 +521,549 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Обратно към страницата <a href=\"../\">Кой използва Дебиан?</a>."
-#~ msgid "More information:"
-#~ msgstr "Повече информация:"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Посетете спонсорите на сайта"
-#~ msgid "Taken by:"
-#~ msgstr "Взет от:"
+#~ msgid "Select a server near you"
+#~ msgstr "Изберете сървър близо до вас"
-#~ msgid "Nobody"
-#~ msgstr "Никого"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Страницата изглежда странно?"
-#~ msgid "Rating:"
-#~ msgstr "Оценка:"
+#~ msgid "Report it!"
+#~ msgstr "Съобщаване"
-#~ msgid "More information"
-#~ msgstr "Повече информация"
+#~ msgid "List of Consultants"
+#~ msgstr "Списък на консултантите"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Предстоящи събития"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Обратно към страницата на консултантите на Debian"
-#~ msgid "link may no longer be valid"
-#~ msgstr "връзката може да не е валидна вече"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "When"
-#~ msgstr "Кога"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Сваляне чрез Jigdo"
-#~ msgid "Where"
-#~ msgstr "Къде"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Сваляне чрез HTTP/FTP"
-#~ msgid "More Info"
-#~ msgstr "Повече инфо"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Купуване на CD и DVD дискове"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debian Инициативи"
+#~ msgid "Network Install"
+#~ msgstr "Мрежова инсталация"
-#~ msgid "Main Coordinator"
-#~ msgstr "Главен координатор"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Сваляне"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Координатор на</th><th>проекта</th>"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Други"
-#~ msgid "Related Links"
-#~ msgstr "Връзки към тази тема"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Картинки"
-#~ msgid "Latest News"
-#~ msgstr "Последни новини"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Огледала"
-#~ msgid "Download calendar entry"
-#~ msgstr "Сваляне на събитията по дата"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync Огледала"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Обратно към: други <a href=\"./\">Debian новини</a> || <a href=\"m4_HOME/"
-#~ "\">началната страница на Debian проекта</a>."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Сваляне чрез Torrent"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (несъществуваща връзка)"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Инфо за версията на image файловете"
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "За да получавате това писмо с новини всяка седмица, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">абонирайте се за debian-news пощенския "
-#~ "списък</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD екип"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Налични са <a href=\"../../\">по-стари броеве</a> от това писмо с новини."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_на_cd"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Новините на Проекта се редактират от <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Новините на Проекта се редактират от <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Този брой на новините за Debian Проекта бе "
-#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "buy"
+#~ msgstr "купи"
+
+#~ msgid "net_install"
+#~ msgstr "net_install"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />други"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />Този брой на новините за Debian Проекта бе "
-#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<a href=\"/MailingLists/disclaimer\">публични пощенски списъци</a> за "
+#~ "англоговорящи отностно CDs/DVDs:"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Този текст бе преведен от %s."
+#~ msgid "Date"
+#~ msgstr "Дата"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Този текст бе преведен от %s."
+#~ msgid "Time Line"
+#~ msgstr "Времева линия"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Този текст бе преведен от %s."
+#~ msgid "Nominations"
+#~ msgstr "Номинации"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Този текст бе преведен от %s."
+#~ msgid "Debate"
+#~ msgstr "Дебат"
-#~ msgid "List of Speakers"
-#~ msgstr "Списък на Лекторите"
+#~ msgid "Platforms"
+#~ msgstr "Платформи"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Обратно към <a href=\"./\">страницата за Debian лекторите</a>."
+#~ msgid "Proposer"
+#~ msgstr "Инициатор"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "За да получавате това писмо с новини всяка седмица на Вашият e-mail, <a "
-#~ "href=\"https://lists.debian.org/debian-news/\">запишете се в debian-news "
-#~ "пощенския списък</a>."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Предложение А Инициатор"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian седмични новини се редактира от <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Предложение Б Инициатор"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Предложение В Инициатор"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian седмични новини бяха редактирани от <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Предложение Г Инициатор"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Предложение Д Инициатор"
-#~ msgid "No requests for adoption"
-#~ msgstr "Няма заявления за адаптиране"
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Предложение Е Предложител"
-#~ msgid "No orphaned packages"
-#~ msgstr "Няма изоставени пакети"
+#~ msgid "Seconds"
+#~ msgstr "Арбитри"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Няма пакети, чакащи за адаптиране"
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Предложение А Арбитри"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Няма пакети, чакащи да бъдат пакетирани"
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Предложение Б Арбитри"
-#~ msgid "No Requested packages"
-#~ msgstr "Няма заявени пакети"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Предложение В Арбитри"
-#~ msgid "No help requested"
-#~ msgstr "Няма проявявено желание за помощ"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Предложение В Арбитри"
-#~ msgid "in adoption since today."
-#~ msgstr "в процес на адаптиране от днес."
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Предложение Г Арбитри"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "в процес на адаптиране от вчера."
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Предложение Д Арбитри"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s дни в процес на адаптиране."
+#~ msgid "Opposition"
+#~ msgstr "Опозиция"
-#~ msgid "in preparation since today."
-#~ msgstr "в процес на подготовка от днес."
+#~ msgid "Text"
+#~ msgstr "Текст"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "в процес на подготовка от вчера."
+#~ msgid "Proposal A"
+#~ msgstr "Предложение А"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s дни в процес на подготовка."
+#~ msgid "Proposal B"
+#~ msgstr "Предложение Б"
-#~ msgid "requested today."
-#~ msgstr "заявен днес."
+#~ msgid "Proposal C"
+#~ msgstr "Предложение В"
-#~ msgid "requested yesterday."
-#~ msgstr "заявен вчера."
+#~ msgid "Proposal D"
+#~ msgstr "Предложение Г"
-#~ msgid "requested %s days ago."
-#~ msgstr "заявен преди %s дни."
+#~ msgid "Proposal E"
+#~ msgstr "Предложение Д"
-#~ msgid "package info"
-#~ msgstr "инфо за пакета"
+#~ msgid "Proposal F"
+#~ msgstr "Предложение Е"
-#~ msgid "License Information"
-#~ msgstr "Информация за лиценза"
+#~ msgid "Choices"
+#~ msgstr "Възможности"
-#~ msgid "DLS Index"
-#~ msgstr "DLS Индекс"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Предложил Изменение"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Арбитри по изменението"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid "Amendment Text"
+#~ msgstr "Текст на изменението"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal Архив"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Предложител за Изменение A"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Арбитри по изменението A"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Версия %s: %s"
+#~ msgid "Amendment Text A"
+#~ msgstr "Текст на изменението A"
-#~ msgid "Date published"
-#~ msgstr "Дата на публикуване"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Предложител за Изменение B"
-#~ msgid "License"
-#~ msgstr "Лиценз"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Арбитри по изменението B"
-#~ msgid "Version"
-#~ msgstr "Версия"
+#~ msgid "Amendment Text B"
+#~ msgstr "Текст на изменението B"
-#~ msgid "Summary"
-#~ msgstr "Резюме"
+#~ msgid "Amendments"
+#~ msgstr "Вносители на изменението"
-#~ msgid "Justification"
-#~ msgstr "Подравнение"
+#~ msgid "Proceedings"
+#~ msgstr "В процес"
-#~ msgid "Discussion"
-#~ msgstr "Дискусия"
+#~ msgid "Majority Requirement"
+#~ msgstr "Изискване за мнозинство"
-#~ msgid "Original Summary"
-#~ msgstr "Оригинално резюме"
+#~ msgid "Data and Statistics"
+#~ msgstr "Данни и Статистики"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Оригиналното резюме на <summary-author/> може да бъде прочетено в <a href="
-#~ "\"<summary-url/>\">архива на списъците</a>."
+#~ msgid "Quorum"
+#~ msgstr "Кворум"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Това резюме бе подготвено от <summary-author/>."
+#~ msgid "Minimum Discussion"
+#~ msgstr "Минимум Дискусия"
-#~ msgid "License text (translated)"
-#~ msgstr "Текст на лиценза (преведен)"
+#~ msgid "Ballot"
+#~ msgstr "Балотаж"
-#~ msgid "License text"
-#~ msgstr "Текст на лиценза"
+#~ msgid "Forum"
+#~ msgstr "Форум"
-#~ msgid "free"
-#~ msgstr "свободен"
+#~ msgid "Outcome"
+#~ msgstr "Решение"
-#~ msgid "non-free"
-#~ msgstr "не-свободен"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Чака&nbsp;за&nbsp;спонсори"
-#~ msgid "not redistributable"
-#~ msgstr "не може да се разпространява"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "В&nbsp;дискусия"
-#~ msgid "Free"
-#~ msgstr "Свободен"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Отворен за&nbsp;гласуване"
-#~ msgid "Non-Free"
-#~ msgstr "Не-свободен"
+#~ msgid "Decided"
+#~ msgstr "Решен"
-#~ msgid "Not Redistributable"
-#~ msgstr "Не може да се разпространява"
+#~ msgid "Withdrawn"
+#~ msgstr "Върнат"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Прочетете страницата с <a href=\"./\">информация за лиценза</a> за "
-#~ "обобщен поглед върху лицензните споразумения на Debian - Debian License "
-#~ "Summaries (DLS)."
+#~ msgid "Other"
+#~ msgstr "Друг"
-#~ msgid "Vote"
-#~ msgstr "Гласуване"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Главна&nbsp;страница&nbsp;за гласуване"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Прочитане на&nbsp;резултат"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Стъпка по&nbsp;стъпка"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Проследяване на&nbsp;предложение"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Изпращане на&nbsp;предложение"
#~ msgid "Amend&nbsp;a&nbsp;Proposal"
#~ msgstr "Редактиране на&nbsp;предложение"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Изпращане на&nbsp;предложение"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Проследяване на&nbsp;предложение"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Стъпка по&nbsp;стъпка"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Прочитане на&nbsp;резултат"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Главна&nbsp;страница&nbsp;за гласуване"
+#~ msgid "Vote"
+#~ msgstr "Гласуване"
-#~ msgid "Other"
-#~ msgstr "Друг"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Прочетете страницата с <a href=\"./\">информация за лиценза</a> за "
+#~ "обобщен поглед върху лицензните споразумения на Debian - Debian License "
+#~ "Summaries (DLS)."
-#~ msgid "Withdrawn"
-#~ msgstr "Върнат"
+#~ msgid "Not Redistributable"
+#~ msgstr "Не може да се разпространява"
-#~ msgid "Decided"
-#~ msgstr "Решен"
+#~ msgid "Non-Free"
+#~ msgstr "Не-свободен"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Отворен за&nbsp;гласуване"
+#~ msgid "Free"
+#~ msgstr "Свободен"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "В&nbsp;дискусия"
+#~ msgid "not redistributable"
+#~ msgstr "не може да се разпространява"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Чака&nbsp;за&nbsp;спонсори"
+#~ msgid "non-free"
+#~ msgstr "не-свободен"
-#~ msgid "Outcome"
-#~ msgstr "Решение"
+#~ msgid "free"
+#~ msgstr "свободен"
-#~ msgid "Forum"
-#~ msgstr "Форум"
+#~ msgid "License text"
+#~ msgstr "Текст на лиценза"
-#~ msgid "Ballot"
-#~ msgstr "Балотаж"
+#~ msgid "License text (translated)"
+#~ msgstr "Текст на лиценза (преведен)"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Минимум Дискусия"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Това резюме бе подготвено от <summary-author/>."
-#~ msgid "Quorum"
-#~ msgstr "Кворум"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Оригиналното резюме на <summary-author/> може да бъде прочетено в <a href="
+#~ "\"<summary-url/>\">архива на списъците</a>."
-#~ msgid "Data and Statistics"
-#~ msgstr "Данни и Статистики"
+#~ msgid "Original Summary"
+#~ msgstr "Оригинално резюме"
-#~ msgid "Majority Requirement"
-#~ msgstr "Изискване за мнозинство"
+#~ msgid "Discussion"
+#~ msgstr "Дискусия"
-#~ msgid "Proceedings"
-#~ msgstr "В процес"
+#~ msgid "Justification"
+#~ msgstr "Подравнение"
-#~ msgid "Amendments"
-#~ msgstr "Вносители на изменението"
+#~ msgid "Summary"
+#~ msgstr "Резюме"
-#~ msgid "Amendment Text B"
-#~ msgstr "Текст на изменението B"
+#~ msgid "Version"
+#~ msgstr "Версия"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Арбитри по изменението B"
+#~ msgid "License"
+#~ msgstr "Лиценз"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Предложител за Изменение B"
+#~ msgid "Date published"
+#~ msgstr "Дата на публикуване"
-#~ msgid "Amendment Text A"
-#~ msgstr "Текст на изменението A"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Версия %s: %s"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Арбитри по изменението A"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Предложител за Изменение A"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal Архив"
-#~ msgid "Amendment Text"
-#~ msgstr "Текст на изменението"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Арбитри по изменението"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Предложил Изменение"
+#~ msgid "DLS Index"
+#~ msgstr "DLS Индекс"
-#~ msgid "Choices"
-#~ msgstr "Възможности"
+#~ msgid "License Information"
+#~ msgstr "Информация за лиценза"
-#~ msgid "Proposal F"
-#~ msgstr "Предложение Е"
+#~ msgid "package info"
+#~ msgstr "инфо за пакета"
-#~ msgid "Proposal E"
-#~ msgstr "Предложение Д"
+#~ msgid "requested %s days ago."
+#~ msgstr "заявен преди %s дни."
-#~ msgid "Proposal D"
-#~ msgstr "Предложение Г"
+#~ msgid "requested yesterday."
+#~ msgstr "заявен вчера."
-#~ msgid "Proposal C"
-#~ msgstr "Предложение В"
+#~ msgid "requested today."
+#~ msgstr "заявен днес."
-#~ msgid "Proposal B"
-#~ msgstr "Предложение Б"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s дни в процес на подготовка."
-#~ msgid "Proposal A"
-#~ msgstr "Предложение А"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "в процес на подготовка от вчера."
-#~ msgid "Text"
-#~ msgstr "Текст"
+#~ msgid "in preparation since today."
+#~ msgstr "в процес на подготовка от днес."
-#~ msgid "Opposition"
-#~ msgstr "Опозиция"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s дни в процес на адаптиране."
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Предложение Д Арбитри"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "в процес на адаптиране от вчера."
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Предложение Г Арбитри"
+#~ msgid "in adoption since today."
+#~ msgstr "в процес на адаптиране от днес."
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Предложение В Арбитри"
+#~ msgid "No help requested"
+#~ msgstr "Няма проявявено желание за помощ"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Предложение В Арбитри"
+#~ msgid "No Requested packages"
+#~ msgstr "Няма заявени пакети"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Предложение Б Арбитри"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Няма пакети, чакащи да бъдат пакетирани"
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Предложение А Арбитри"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Няма пакети, чакащи за адаптиране"
-#~ msgid "Seconds"
-#~ msgstr "Арбитри"
+#~ msgid "No orphaned packages"
+#~ msgstr "Няма изоставени пакети"
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Предложение Е Предложител"
+#~ msgid "No requests for adoption"
+#~ msgstr "Няма заявления за адаптиране"
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Предложение Д Инициатор"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Предложение Г Инициатор"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian седмични новини бяха редактирани от <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Предложение В Инициатор"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Предложение Б Инициатор"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian седмични новини се редактира от <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Предложение А Инициатор"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "За да получавате това писмо с новини всяка седмица на Вашият e-mail, <a "
+#~ "href=\"https://lists.debian.org/debian-news/\">запишете се в debian-news "
+#~ "пощенския списък</a>."
-#~ msgid "Proposer"
-#~ msgstr "Инициатор"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Обратно към <a href=\"./\">страницата за Debian лекторите</a>."
-#~ msgid "Platforms"
-#~ msgstr "Платформи"
+#~ msgid "List of Speakers"
+#~ msgstr "Списък на Лекторите"
-#~ msgid "Debate"
-#~ msgstr "Дебат"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Този текст бе преведен от %s."
-#~ msgid "Nominations"
-#~ msgstr "Номинации"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Този текст бе преведен от %s."
-#~ msgid "Time Line"
-#~ msgstr "Времева линия"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Този текст бе преведен от %s."
-#~ msgid "Date"
-#~ msgstr "Дата"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Този текст бе преведен от %s."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">публични пощенски списъци</a> за "
-#~ "англоговорящи отностно CDs/DVDs:"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />други"
-
-#~ msgid "net_install"
-#~ msgstr "net_install"
-
-#~ msgid "buy"
-#~ msgstr "купи"
+#~ "<void id=\"plural\" />Този брой на новините за Debian Проекта бе "
+#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Този брой на новините за Debian Проекта бе "
+#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Новините на Проекта се редактират от <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Новините на Проекта се редактират от <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_на_cd"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Налични са <a href=\"../../\">по-стари броеве</a> от това писмо с новини."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD екип"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "За да получавате това писмо с новини всяка седмица, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">абонирайте се за debian-news пощенския "
+#~ "списък</a>."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Инфо за версията на image файловете"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (несъществуваща връзка)"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Сваляне чрез Torrent"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Обратно към: други <a href=\"./\">Debian новини</a> || <a href=\"m4_HOME/"
+#~ "\">началната страница на Debian проекта</a>."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync Огледала"
+#~ msgid "Download calendar entry"
+#~ msgstr "Сваляне на събитията по дата"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Огледала"
+#~ msgid "Latest News"
+#~ msgstr "Последни новини"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Картинки"
+#~ msgid "Related Links"
+#~ msgstr "Връзки към тази тема"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Други"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Координатор на</th><th>проекта</th>"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Сваляне"
+#~ msgid "Main Coordinator"
+#~ msgstr "Главен координатор"
-#~ msgid "Network Install"
-#~ msgstr "Мрежова инсталация"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debian Инициативи"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Купуване на CD и DVD дискове"
+#~ msgid "More Info"
+#~ msgstr "Повече инфо"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Сваляне чрез HTTP/FTP"
+#~ msgid "Where"
+#~ msgstr "Къде"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Сваляне чрез Jigdo"
+#~ msgid "When"
+#~ msgstr "Кога"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "link may no longer be valid"
+#~ msgstr "връзката може да не е валидна вече"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Обратно към страницата на консултантите на Debian"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Предстоящи събития"
-#~ msgid "List of Consultants"
-#~ msgstr "Списък на консултантите"
+#~ msgid "More information"
+#~ msgstr "Повече информация"
-#~ msgid "Report it!"
-#~ msgstr "Съобщаване"
+#~ msgid "Rating:"
+#~ msgstr "Оценка:"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Страницата изглежда странно?"
+#~ msgid "Nobody"
+#~ msgstr "Никого"
-#~ msgid "Select a server near you"
-#~ msgstr "Изберете сървър близо до вас"
+#~ msgid "Taken by:"
+#~ msgstr "Взет от:"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Посетете спонсорите на сайта"
+#~ msgid "More information:"
+#~ msgstr "Повече информация:"
diff --git a/bulgarian/po/vendors.bg.po b/bulgarian/po/vendors.bg.po
index 78e6fb1f83b..92c5eb2af37 100644
--- a/bulgarian/po/vendors.bg.po
+++ b/bulgarian/po/vendors.bg.po
@@ -69,29 +69,29 @@ msgstr "източник"
msgid "and"
msgstr "и"
-#~ msgid "Architectures:"
-#~ msgstr "Архитектури:"
+#~ msgid "Vendor:"
+#~ msgstr "Търговец:"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD носител:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Връзка към страницата за Дебиан:"
-#~ msgid "CD Type:"
-#~ msgstr "Компактдиск:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Позволява подпомагането на Дебиан:"
-#~ msgid "email:"
-#~ msgstr "email:"
+#~ msgid "Country:"
+#~ msgstr "Държава:"
#~ msgid "Ship International:"
#~ msgstr "Доставя за целия свят:"
-#~ msgid "Country:"
-#~ msgstr "Държава:"
+#~ msgid "email:"
+#~ msgstr "email:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Позволява подпомагането на Дебиан:"
+#~ msgid "CD Type:"
+#~ msgstr "Компактдиск:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Връзка към страницата за Дебиан:"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD носител:"
-#~ msgid "Vendor:"
-#~ msgstr "Търговец:"
+#~ msgid "Architectures:"
+#~ msgstr "Архитектури:"
diff --git a/catalan/po/blends.ca.po b/catalan/po/blends.ca.po
index dc7296427a9..e4b256c10e8 100644
--- a/catalan/po/blends.ca.po
+++ b/catalan/po/blends.ca.po
@@ -24,35 +24,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -60,13 +68,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -81,19 +89,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -102,7 +102,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -111,13 +111,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/catalan/po/bugs.ca.po b/catalan/po/bugs.ca.po
index e8031975a7f..f00133a7b4b 100644
--- a/catalan/po/bugs.ca.po
+++ b/catalan/po/bugs.ca.po
@@ -160,152 +160,152 @@ msgstr "Arxivats"
msgid "Archived and Unarchived"
msgstr "Arxivats i desarxivats"
-#~ msgid "Flags:"
-#~ msgstr "Opcions:"
-
-#~ msgid "active bugs"
-#~ msgstr "errors actius"
+#~ msgid "Exclude tag:"
+#~ msgstr "Exclou la etiqueta:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "mostra els errors fusionats només una vegada"
+#~ msgid "Include tag:"
+#~ msgstr "Inclou la etiqueta:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "no ordena pel seu estat de gravetat"
+#~ msgid "lfs"
+#~ msgstr "lfs (sistema de fitxers gran)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "no ensenya taula de continguts a la capçalera"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "no ensenya estadístiques al peu de pàgina"
+#~ msgid "wontfix"
+#~ msgstr "wontfix (no s'arreglarà)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates (actualitzacions proposades)"
+#~ msgid "upstream"
+#~ msgstr "upstream (responsable autor original)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates (actualitzacions proposades de testing)"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible (no reproduïble)"
-#~ msgid "Package version:"
-#~ msgstr "Versió del paquet:"
+#~ msgid "security"
+#~ msgstr "security (seguretat)"
-#~ msgid "Distribution:"
-#~ msgstr "Distribució:"
+#~ msgid "patch"
+#~ msgstr "patch (pedaç)"
-#~ msgid "bugs"
-#~ msgstr "errors"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo (més informació)"
-#~ msgid "open"
-#~ msgstr "obert"
+#~ msgid "l10n"
+#~ msgstr "l10n (localització)"
-#~ msgid "forwarded"
-#~ msgstr "enviat"
+#~ msgid "help"
+#~ msgstr "help (ajuda)"
-#~ msgid "pending"
-#~ msgstr "pendent"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream (arreglat per l'autor original)"
-#~ msgid "fixed"
-#~ msgstr "fixat"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental (arreglat a experimental)"
-#~ msgid "done"
-#~ msgstr "tancat"
+#~ msgid "d-i"
+#~ msgstr "d-i (instal·lador)"
-#~ msgid "Include status:"
-#~ msgstr "Inclou l'estat:"
+#~ msgid "confirmed"
+#~ msgstr "confirmed (confirmat)"
-#~ msgid "Exclude status:"
-#~ msgstr "Exclou l'estat:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "crític"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "grave"
-#~ msgstr "greu"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "seriós"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "important"
-#~ msgstr "important"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "minor"
-#~ msgstr "menor"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "wishlist"
-#~ msgstr "desig"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Inclou la gravetat:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Exclou la gravetat:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Inclou la gravetat:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "desig"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "menor"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "important"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "serious"
+#~ msgstr "seriós"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "greu"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "critical"
+#~ msgstr "crític"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Exclou l'estat:"
-#~ msgid "confirmed"
-#~ msgstr "confirmed (confirmat)"
+#~ msgid "Include status:"
+#~ msgstr "Inclou l'estat:"
-#~ msgid "d-i"
-#~ msgstr "d-i (instal·lador)"
+#~ msgid "done"
+#~ msgstr "tancat"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental (arreglat a experimental)"
+#~ msgid "fixed"
+#~ msgstr "fixat"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream (arreglat per l'autor original)"
+#~ msgid "pending"
+#~ msgstr "pendent"
-#~ msgid "help"
-#~ msgstr "help (ajuda)"
+#~ msgid "forwarded"
+#~ msgstr "enviat"
-#~ msgid "l10n"
-#~ msgstr "l10n (localització)"
+#~ msgid "open"
+#~ msgstr "obert"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo (més informació)"
+#~ msgid "bugs"
+#~ msgstr "errors"
-#~ msgid "patch"
-#~ msgstr "patch (pedaç)"
+#~ msgid "Distribution:"
+#~ msgstr "Distribució:"
-#~ msgid "security"
-#~ msgstr "security (seguretat)"
+#~ msgid "Package version:"
+#~ msgstr "Versió del paquet:"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible (no reproduïble)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates (actualitzacions proposades de testing)"
-#~ msgid "upstream"
-#~ msgstr "upstream (responsable autor original)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates (actualitzacions proposades)"
-#~ msgid "wontfix"
-#~ msgstr "wontfix (no s'arreglarà)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "no ensenya estadístiques al peu de pàgina"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "no ensenya taula de continguts a la capçalera"
-#~ msgid "lfs"
-#~ msgstr "lfs (sistema de fitxers gran)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "no ordena pel seu estat de gravetat"
-#~ msgid "Include tag:"
-#~ msgstr "Inclou la etiqueta:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "mostra els errors fusionats només una vegada"
-#~ msgid "Exclude tag:"
-#~ msgstr "Exclou la etiqueta:"
+#~ msgid "active bugs"
+#~ msgstr "errors actius"
+
+#~ msgid "Flags:"
+#~ msgstr "Opcions:"
diff --git a/catalan/po/distrib.ca.po b/catalan/po/distrib.ca.po
index 710c613ab56..4b395c5896d 100644
--- a/catalan/po/distrib.ca.po
+++ b/catalan/po/distrib.ca.po
@@ -210,54 +210,54 @@ msgstr ""
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr ""
+#~ "paquets que contenen fitxers o directoris anomenats d'aquesta manera"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "tots els fitxers d'aquest paquet"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Distingeix entre majúscules i minúscules"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "no"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "sí"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Permet la cerca en subparaules"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Search case sensitive"
+#~ msgstr "Cerca tenint en compte la diferència entre majúscules i minúscules"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "non-US"
+#~ msgstr "non-US"
#~ msgid "MIPS (DEC)"
#~ msgstr "MIPS (DEC)"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Search case sensitive"
-#~ msgstr "Cerca tenint en compte la diferència entre majúscules i minúscules"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Permet la cerca en subparaules"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "yes"
-#~ msgstr "sí"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "no"
-#~ msgstr "no"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Case sensitive"
-#~ msgstr "Distingeix entre majúscules i minúscules"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "all files in this package"
-#~ msgstr "tots els fitxers d'aquest paquet"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr ""
-#~ "paquets que contenen fitxers o directoris anomenats d'aquesta manera"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/catalan/po/doc.ca.po b/catalan/po/doc.ca.po
index bdf54150e28..79284773573 100644
--- a/catalan/po/doc.ca.po
+++ b/catalan/po/doc.ca.po
@@ -30,8 +30,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -55,31 +55,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -91,7 +67,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -103,7 +79,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -111,6 +87,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autor:"
@@ -163,10 +155,10 @@ msgstr "(versió <get-var version />"
msgid "plain text"
msgstr "text pla"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -191,12 +183,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -227,12 +213,12 @@ msgstr ""
msgid "PDF"
msgstr ""
+#~ msgid "Language:"
+#~ msgstr "Idioma:"
+
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "Useu <a href=\"cvs\">SVN</a> per a descarregar el text font en SGML per a "
#~ "<get-var ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
diff --git a/catalan/po/l10n.ca.po b/catalan/po/l10n.ca.po
index 256d95283de..8fd8c2f2712 100644
--- a/catalan/po/l10n.ca.po
+++ b/catalan/po/l10n.ca.po
@@ -101,8 +101,8 @@ msgstr "fitxers POT"
msgid "Hints for translators"
msgstr "Consells per als traductors"
-#~ msgid "Translated templates"
-#~ msgstr "Plantilla traduïda"
-
#~ msgid "Original templates"
#~ msgstr "Plantilla original"
+
+#~ msgid "Translated templates"
+#~ msgstr "Plantilla traduïda"
diff --git a/catalan/po/mailinglists.ca.po b/catalan/po/mailinglists.ca.po
index 8854e5de1a5..f17252072a0 100644
--- a/catalan/po/mailinglists.ca.po
+++ b/catalan/po/mailinglists.ca.po
@@ -130,9 +130,9 @@ msgstr "oberta"
msgid "closed"
msgstr "tancada"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Si us plau, seleccioneu a quines llistes us desitgeu donar-vos de baixa:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
diff --git a/catalan/po/organization.ca.po b/catalan/po/organization.ca.po
index 67d7556c452..ee3e9375d63 100644
--- a/catalan/po/organization.ca.po
+++ b/catalan/po/organization.ca.po
@@ -76,22 +76,22 @@ msgid "Officers"
msgstr "Directors"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribució"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Equip de publicitat"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Suport i infraestructura"
@@ -108,211 +108,211 @@ msgstr "Líder"
msgid "Technical Committee"
msgstr "Comitè tècnic"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Secretari"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Projectes de desenvolupament"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Arxius FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Mestres de FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Assistents de FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Paquets individuals"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Gestió de llançaments"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Equip de llançament"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Control de qualitat"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Equip del sistema d'instal·lació"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Notes de la versió"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Imatges de CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Producció"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Proves"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infraestructura d'autocompilació"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Equip de wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Administració dels dimonis de compilació"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Documentació"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Llista de paquets en perspectiva o en falta de feina"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Equip del sistema autònom"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Arquitectures"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Configuracions especials"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Portàtils"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Tallafocs"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Sistemes empotrats"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Contacte de premsa"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Pàgines web"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Projecte Debian dona"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Esdeveniments"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "Comitè de DebConf"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Programa de socis"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Coordinació de donacions de maquinari"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Suport d'usuari"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Sistema de Seguiment d'Errors"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administració i arxius de les llistes de correu"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Recepció de nous mantenidors"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Administradors dels comptes de Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantenidors de l'anell de claus (PGP i GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Equip de seguretat"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Pàgina de consultors"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Pàgina de proveïdors de CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Política"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Administració del sistema"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -321,7 +321,7 @@ msgstr ""
"Debian, incloent problemes amb contrasenyes o si necessiteu la instal·lació "
"d'un paquet."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -331,151 +331,169 @@ msgstr ""
"pàgina de <a href=\"https://db.debian.org/machines.cgi\">Màquines de Debian</"
"a>, hauria de contenir informació de l'administrador de cada màquina."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador del directori LDAP de desenvolupadors"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Rèpliques"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Mantenidor del DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Sistema de seguiment de paquets"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Administració d'Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administració d'Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian per a nens de 1 a 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian per a la pràctica i recerca medica"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian per a l'educació"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian a les oficines de dret"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian per a gent amb discapacitats"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian per a la pràctica i recerca medica"
-#~ msgid "Publicity"
-#~ msgstr "Publicitat"
-
+#: ../../english/intro/organization.data:492
#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Equip de l'anell de claus dels mantenidors de Debian"
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian per a l'educació"
-#~ msgid "Volatile Team"
-#~ msgstr "Equip de llançament da la versió volàtil"
+#~ msgid "Testing Security Team"
+#~ msgstr "Equip de seguretat de Proves"
-#~ msgid "Vendors"
-#~ msgstr "Venedors"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projecte d'auditoria de seguretat"
-#~ msgid "APT Team"
-#~ msgstr "Equip APT"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribució de Debian adaptada"
-#~ msgid "Release Assistants"
-#~ msgstr "Assistents de llançament"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Equip de llançaments per a «stable»"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Assistents de llançaments per a «stable»"
+#~ msgid "Handhelds"
+#~ msgstr "Ordinadors de ma"
-#~ msgid "Release Wizard"
-#~ msgstr "Mag de llançaments"
+#~ msgid "Marketing Team"
+#~ msgstr "Equip de màrqueting"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribució multimedia de Debian"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Els administradors responsables dels dimonis de compilació per a una "
+#~ "arquitectura particular, es poden contactar a <genericemail arch@buildd."
+#~ "debian.org>, per exemple <genericemail i386@buildd.debian.org>."
#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
#~ msgstr ""
-#~ "Aquest encara no és un projecte intern oficial de Debian però ha anunciat "
-#~ "la intenció de ser-ho."
+#~ "Els noms individuals dels administradors dels dimonis de compilació es "
+#~ "poden trobar a <a href=\"http://www.buildd.net\">http://www.buildd.net</"
+#~ "a>. Seleccioneu una arquitecture i una distribució per veure els dimonis "
+#~ "de compilació disponibles i els seus administradors."
-#~ msgid "Mailing List Archives"
-#~ msgstr "Arxius de les llistes de correu"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordinació de signatura de claus"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Sistema d'instal·lació per a «stable»"
+#~ msgid "Accountant"
+#~ msgstr "Contable"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux per a la computació d'empreses"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "El sistema operatiu universal com el seu escriptori"
#~ msgid "Debian for non-profit organisations"
#~ msgstr "Debian per organitzacions sense anim de lucre"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "El sistema operatiu universal com el seu escriptori"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux per a la computació d'empreses"
-#~ msgid "Accountant"
-#~ msgstr "Contable"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Sistema d'instal·lació per a «stable»"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordinació de signatura de claus"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Arxius de les llistes de correu"
#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
#~ msgstr ""
-#~ "Els noms individuals dels administradors dels dimonis de compilació es "
-#~ "poden trobar a <a href=\"http://www.buildd.net\">http://www.buildd.net</"
-#~ "a>. Seleccioneu una arquitecture i una distribució per veure els dimonis "
-#~ "de compilació disponibles i els seus administradors."
+#~ "Aquest encara no és un projecte intern oficial de Debian però ha anunciat "
+#~ "la intenció de ser-ho."
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Els administradors responsables dels dimonis de compilació per a una "
-#~ "arquitectura particular, es poden contactar a <genericemail arch@buildd."
-#~ "debian.org>, per exemple <genericemail i386@buildd.debian.org>."
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribució multimedia de Debian"
-#~ msgid "Marketing Team"
-#~ msgstr "Equip de màrqueting"
+#~ msgid "Release Wizard"
+#~ msgstr "Mag de llançaments"
-#~ msgid "Handhelds"
-#~ msgstr "Ordinadors de ma"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Assistents de llançaments per a «stable»"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Equip de llançaments per a «stable»"
+#~ msgid "Release Assistants"
+#~ msgstr "Assistents de llançament"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribució de Debian adaptada"
+#~ msgid "APT Team"
+#~ msgstr "Equip APT"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projecte d'auditoria de seguretat"
+#~ msgid "Vendors"
+#~ msgstr "Venedors"
-#~ msgid "Testing Security Team"
-#~ msgstr "Equip de seguretat de Proves"
+#~ msgid "Volatile Team"
+#~ msgstr "Equip de llançament da la versió volàtil"
+
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Equip de l'anell de claus dels mantenidors de Debian"
+
+#~ msgid "Publicity"
+#~ msgstr "Publicitat"
+
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
+
+#~ 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 b3306a4e5e1..1f1d281c8d3 100644
--- a/catalan/po/others.ca.po
+++ b/catalan/po/others.ca.po
@@ -338,68 +338,85 @@ msgstr "Versió"
msgid "URL"
msgstr "URL"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "Sol·licitat:"
-#~ msgid "Previous Talks:"
-#~ msgstr "Conferencies prèvies:"
+#~ msgid "Who:"
+#~ msgstr "Qui:"
-#~ msgid "Languages:"
-#~ msgstr "Llenguatge:"
+#~ msgid "Architecture:"
+#~ msgstr "Arquitectura:"
-#~ msgid "Location:"
-#~ msgstr "Localització:"
+#~ msgid "Specifications:"
+#~ msgstr "Especificacions:"
-#~ msgid "Topics:"
-#~ msgstr "Temes:"
+#~ msgid "Where:"
+#~ msgstr "A on:"
-#~ msgid "closed"
-#~ msgstr "tancada"
+#~ msgid "Name:"
+#~ msgstr "Nom:"
-#~ msgid "open"
-#~ msgstr "oberta"
+#~ msgid "Company:"
+#~ msgstr "Companyia:"
-#~ msgid "Unsubscribe"
-#~ msgstr "Dóna'm de baixa"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgid "or"
+#~ msgstr "o"
+
+#~ msgid "Email:"
+#~ msgstr "Correu:"
+
+#~ msgid "Rates:"
+#~ msgstr "Tarifa:"
+
+#~ msgid "Willing to Relocate"
+#~ msgstr "Disponible sense límit geogràfic"
+
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Si us plau, seleccioneu a quines llistes us desitgeu donar-vos de baixa:"
+#~ "<total_consultant> consultors de Debian llistats en <total_country> "
+#~ "païssos per tot el món."
+
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Subscripció a les llistes de correu"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
#~ "Mireu la pàgina de les <a href=\"./#subunsub\">llistes de correu</a> per "
-#~ "a informació de com us podeu dessubscriure usant el correu. També hi ha "
-#~ "disponible un <a href=\"subscribe\">formulari web per a donar-vos d'alta</"
-#~ "a> d'aquestes llistes de correu. "
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Desubscripció de les llistes de correu"
+#~ "a informació de com us podeu subscriure usant el correu. També hi ha "
+#~ "disponible un <a href=\"unsubscribe\">formulari web per a donar-vos de "
+#~ "baixa</a> d'aquestes llistes de correu. "
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "Si us plau respecteu la <a href=\"./#ads\">política d'anuncis en les "
-#~ "llistes de correu Debian</a>."
-
-#~ msgid "Clear"
-#~ msgstr "Netejar"
+#~ "Tingueu en compte que la major part de les llistes de correu de Debian, "
+#~ "són forums publics. Qualsevol correu que s'hi envíi es publicarà als "
+#~ "arxius publics de les llistes de correu i s'indexarà pels motors de "
+#~ "cerques. Us haurieu de suscriure a les llistes de correu de Debian "
+#~ "emprant una adreça de correu que no us importi es façi publica."
-#~ msgid "Subscribe"
-#~ msgstr "Subscriu-m'hi"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "La vostra direcció de correu:"
+#~ msgid "No description given"
+#~ msgstr "Descripció no disponible"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "és de sols lectura, versió resumida."
+#~ msgid "Moderated:"
+#~ msgstr "Moderada:"
-#~ msgid "Subscription:"
-#~ msgstr "Subscripció:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Enviament de missatges només permés a subscriptors."
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -407,82 +424,65 @@ msgstr "URL"
#~ "Aquesta llista de correu només acceptarà missatges signats per un "
#~ "desenvolupador de Debian."
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Enviament de missatges només permés a subscriptors."
+#~ msgid "Subscription:"
+#~ msgstr "Subscripció:"
-#~ msgid "Moderated:"
-#~ msgstr "Moderada:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "és de sols lectura, versió resumida."
-#~ msgid "No description given"
-#~ msgstr "Descripció no disponible"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "La vostra direcció de correu:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
+#~ msgid "Subscribe"
+#~ msgstr "Subscriu-m'hi"
+
+#~ msgid "Clear"
+#~ msgstr "Netejar"
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Tingueu en compte que la major part de les llistes de correu de Debian, "
-#~ "són forums publics. Qualsevol correu que s'hi envíi es publicarà als "
-#~ "arxius publics de les llistes de correu i s'indexarà pels motors de "
-#~ "cerques. Us haurieu de suscriure a les llistes de correu de Debian "
-#~ "emprant una adreça de correu que no us importi es façi publica."
+#~ "Si us plau respecteu la <a href=\"./#ads\">política d'anuncis en les "
+#~ "llistes de correu Debian</a>."
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Desubscripció de les llistes de correu"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
#~ "Mireu la pàgina de les <a href=\"./#subunsub\">llistes de correu</a> per "
-#~ "a informació de com us podeu subscriure usant el correu. També hi ha "
-#~ "disponible un <a href=\"unsubscribe\">formulari web per a donar-vos de "
-#~ "baixa</a> d'aquestes llistes de correu. "
-
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Subscripció a les llistes de correu"
+#~ "a informació de com us podeu dessubscriure usant el correu. També hi ha "
+#~ "disponible un <a href=\"subscribe\">formulari web per a donar-vos d'alta</"
+#~ "a> d'aquestes llistes de correu. "
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
-#~ "<total_consultant> consultors de Debian llistats en <total_country> "
-#~ "païssos per tot el món."
-
-#~ msgid "Willing to Relocate"
-#~ msgstr "Disponible sense límit geogràfic"
-
-#~ msgid "Rates:"
-#~ msgstr "Tarifa:"
-
-#~ msgid "Email:"
-#~ msgstr "Correu:"
-
-#~ msgid "or"
-#~ msgstr "o"
+#~ "Si us plau, seleccioneu a quines llistes us desitgeu donar-vos de baixa:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Unsubscribe"
+#~ msgstr "Dóna'm de baixa"
-#~ msgid "Company:"
-#~ msgstr "Companyia:"
+#~ msgid "open"
+#~ msgstr "oberta"
-#~ msgid "Name:"
-#~ msgstr "Nom:"
+#~ msgid "closed"
+#~ msgstr "tancada"
-#~ msgid "Where:"
-#~ msgstr "A on:"
+#~ msgid "Topics:"
+#~ msgstr "Temes:"
-#~ msgid "Specifications:"
-#~ msgstr "Especificacions:"
+#~ msgid "Location:"
+#~ msgstr "Localització:"
-#~ msgid "Architecture:"
-#~ msgstr "Arquitectura:"
+#~ msgid "Languages:"
+#~ msgstr "Llenguatge:"
-#~ msgid "Who:"
-#~ msgstr "Qui:"
+#~ msgid "Previous Talks:"
+#~ msgstr "Conferencies prèvies:"
-#~ msgid "Wanted:"
-#~ msgstr "Sol·licitat:"
+#~ 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 8b17ea0e020..40d318a9cf0 100644
--- a/catalan/po/partners.ca.po
+++ b/catalan/po/partners.ca.po
@@ -11,163 +11,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -176,45 +167,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -223,7 +210,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -231,187 +218,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/catalan/po/ports.ca.po b/catalan/po/ports.ca.po
index 770c04a4476..cfa5ad24315 100644
--- a/catalan/po/ports.ca.po
+++ b/catalan/po/ports.ca.po
@@ -118,134 +118,134 @@ msgstr "Debian per a PowerPC"
msgid "Debian for Sparc"
msgstr "Debian per a Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian per a portàtils"
+#~ msgid "Vendor/Name"
+#~ msgstr "Venedor/Nom"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian per a AMD64"
+#~ msgid "Date announced"
+#~ msgstr "Data d'anunci"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian per a ARM"
+#~ msgid "Clock"
+#~ msgstr "Rellotge"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian per a Beowulf"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "Main"
-#~ msgstr "Principal"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian per a Motorola 680x0"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian per a MIPS"
+#~ msgid "Specials"
+#~ msgstr "Especials"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian per a S/390"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Sense FPU (R2010), memòries cau externes"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian per a Sparc64"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Sense FPU (R3010)"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, controladora LCD, Compact Flash, UART, port paral·lel, RTC, "
-#~ "Keyboard, USB, Touchpad, Audio"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Memòria cau L1 indexada virtualment, controladora de memòria cau L2"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, port paral·lel, RTC, Audio, PCIC"
+#~ msgid "External L1 cache"
+#~ msgstr "Memòria cau L1 externa"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "CPU amb múltiples xips"
#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
#~ msgstr ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, port "
-#~ "paral·lel"
+#~ "Mips16 amb extensions isa, sense FPU, 512k flash, 16k ram, DMAC, UART, "
+#~ "Timer, I2C, Watchdog"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, controladora LCD"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 memòria cau L2 en placa"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, bus extern de 64 bits, memòria cau L2 externa"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, bus extern de 64 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Sense FPU, SDRAMC, ROMC, Timer, PCMCIA, controladora LCD, IrDA"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, bus extern de 32 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, controladora LCD, IrDA"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 ethernet 10/100, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
#~ msgstr "Sense FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 ethernet 10/100, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, controladora LCD, IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, bus extern de 32 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Sense FPU, SDRAMC, ROMC, Timer, PCMCIA, controladora LCD, IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, bus extern de 64 bits"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, bus extern de 64 bits, memòria cau L2 externa"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 memòria cau L2 en placa"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, controladora LCD"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
#~ msgstr ""
-#~ "Mips16 amb extensions isa, sense FPU, 512k flash, 16k ram, DMAC, UART, "
-#~ "Timer, I2C, Watchdog"
-
-#~ msgid "Multiple chip CPU"
-#~ msgstr "CPU amb múltiples xips"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, port "
+#~ "paral·lel"
-#~ msgid "External L1 cache"
-#~ msgstr "Memòria cau L1 externa"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, port paral·lel, RTC, Audio, PCIC"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Memòria cau L1 indexada virtualment, controladora de memòria cau L2"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, controladora LCD, Compact Flash, UART, port paral·lel, RTC, "
+#~ "Keyboard, USB, Touchpad, Audio"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Sense FPU (R3010)"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian per a Sparc64"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Sense FPU (R2010), memòries cau externes"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian per a S/390"
-#~ msgid "Specials"
-#~ msgstr "Especials"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian per a MIPS"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian per a Motorola 680x0"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Main"
+#~ msgstr "Principal"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian per a Beowulf"
-#~ msgid "Clock"
-#~ msgstr "Rellotge"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian per a ARM"
-#~ msgid "Date announced"
-#~ msgstr "Data d'anunci"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian per a AMD64"
-#~ msgid "Vendor/Name"
-#~ msgstr "Venedor/Nom"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian per a portàtils"
diff --git a/catalan/po/stats.ca.po b/catalan/po/stats.ca.po
index 730ea755a86..99c32f43619 100644
--- a/catalan/po/stats.ca.po
+++ b/catalan/po/stats.ca.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/catalan/po/templates.ca.po b/catalan/po/templates.ca.po
index 8964f5ec729..c20a4712847 100644
--- a/catalan/po/templates.ca.po
+++ b/catalan/po/templates.ca.po
@@ -49,9 +49,9 @@ msgid ""
"maintained and updated through the work of many users who volunteer their "
"time and effort."
msgstr ""
-"Debian és un sistema operatiu i una distribució de Programari Lliure. "
-"Es manté i actualitza gràcies a la feina de molts usuaris que contribueixen "
-"amb el seu treball i esforç."
+"Debian és un sistema operatiu i una distribució de Programari Lliure. Es "
+"manté i actualitza gràcies a la feina de molts usuaris que contribueixen amb "
+"el seu treball i esforç."
#: ../../english/template/debian/common_translation.wml:16
msgid "debian, GNU, linux, unix, open source, free, DFSG"
@@ -200,19 +200,26 @@ msgstr "en la versió 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Per informar d'algun problema amb el lloc web, envieu un correu en anglès a "
-"la llista de correu arxivada publicament "
-"<a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</"
-"a>.Per a altre informació de contacte, vegeu la <a href=\"m4_HOME/contact"
-"\">pàgina de contacte</a> de Debian. El codi font del lloc web està "
-"<a href=\"m4_HOME/devel/website/using_cvs\">disponible</a>."
+"la llista de correu arxivada publicament <a href=\"mailto:debian-www@lists."
+"debian.org\">debian-www@lists.debian.org</a>.Per a altre informació de "
+"contacte, vegeu la <a href=\"m4_HOME/contact\">pàgina de contacte</a> de "
+"Debian. El codi font del lloc web està <a href=\"m4_HOME/devel/website/"
+"using_cvs\">disponible</a>."
#: ../../english/template/debian/footer.wml:108
msgid "Last Modified"
@@ -507,6 +514,10 @@ msgid ""
msgstr ""
"<em>Nota:</em> El document original d'aquesta traducció ja no existeix."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -515,573 +526,573 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Tornar a la <a href=\"./\">pàgina de Qui fa servir Debian?</a>."
-#~ msgid "More information"
-#~ msgstr "Més informació"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Visiteu el lloc del patrocinador"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Properes atraccions"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Heu trobat algun problema amb el disseny del lloc web?"
-#~ msgid "link may no longer be valid"
-#~ msgstr "potser l'enllaç ja no és vàlid"
+#~ msgid "Report it!"
+#~ msgstr "Informa'n!"
-#~ msgid "When"
-#~ msgstr "Quan"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Tria un servidor a prop teu: &nbsp;"
-#~ msgid "Where"
-#~ msgstr "On"
+#~ msgid "More information:"
+#~ msgstr "Més informació:"
-#~ msgid "More Info"
-#~ msgstr "Més informació"
+#~ msgid "Taken by:"
+#~ msgstr "Agafat per:"
-#~ msgid "Debian Involvement"
-#~ msgstr "Participació de Debian"
+#~ msgid "Nobody"
+#~ msgstr "Ningú"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordinador principal"
+#~ msgid "Rating:"
+#~ msgstr "Puntuació:"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordinador del</th><th>Projecte</th>"
+#~ msgid "List of Consultants"
+#~ msgstr "Llista de consultors"
-#~ msgid "Related Links"
-#~ msgstr "Enllaços relacionats"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tornar a la <a href=\"./\">pàgina de consultors de Debian</a>."
-#~ msgid "Latest News"
-#~ msgstr "Darreres notícies"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Download calendar entry"
-#~ msgstr "Descarrega l'entrada del calendari"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Descàrrega amb Jigdo"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Tornar a: altres <a href=\"./\">notícies de Debian</a> || la <a href="
-#~ "\"m4_HOME/\">pàgina principal del projecte Debian</a>."
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Descàrrega per HTTP/FTP"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (enllaç trencat)"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Compra CD o DVD"
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
-#~ "de correu debian-news.</a>"
+#~ msgid "Network Install"
+#~ msgstr "Instal·lació per xarxa"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Els <a href=\"../../\">números anteriors</a> d'aquest butlletí estan "
-#~ "disponibles."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Descàrrega"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Misc"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Treball artístic"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
-#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Replicant"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
-#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Repliques rsync"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Ha estat traduït per %s."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Descàrrega amb Torrent"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Ha estat traduït per %s."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Informació de llançament d'imatge"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Ha estat traduït per %s."
+#~ msgid "Debian CD team"
+#~ msgstr "Equip de CD de Debian"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Ha estat traduït per %s."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_en_cd"
-#~ msgid "List of Speakers"
-#~ msgstr "Llista de conferenciants"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />pmf"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Tornar a la <a href=\"./\">pàgina de conferenciants de Debian</a>."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
-#~ "de correu debian-news.</a>"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "buy"
+#~ msgstr "compra"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "net_install"
+#~ msgstr "instal·lació_per_xarxa"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
-#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />misc"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
-#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<a href=\"/MailingLists/disclaimer\">Llista de correu publica</a> en "
+#~ "anglès per a CDs/DVDs:"
-#~ msgid "No requests for adoption"
-#~ msgstr "Sense demandes d'adopció"
+#~ msgid "Date"
+#~ msgstr "Data"
-#~ msgid "No orphaned packages"
-#~ msgstr "Sense paquets deixats orfes"
+#~ msgid "Time Line"
+#~ msgstr "Línia temporal"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Sense paquets esperant ser adoptats"
+#~ msgid "Nominations"
+#~ msgstr "Nominacions"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Sense paquets esperant ser empaquetats"
+#~ msgid "Debate"
+#~ msgstr "Debat"
-#~ msgid "No Requested packages"
-#~ msgstr "Sense paquets demanats"
+#~ msgid "Platforms"
+#~ msgstr "Plataformes"
-#~ msgid "No help requested"
-#~ msgstr "Sense demandes d'ajuda"
+#~ msgid "Proposer"
+#~ msgstr "Proponent"
-#~ msgid "in adoption since today."
-#~ msgstr "en adopció des de avui."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Proponent de la proposta A"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "en adopció des de ahir."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Proponent de la proposta B"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s dies en adopció."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Proponent de la proposta C"
-#~ msgid "in preparation since today."
-#~ msgstr "en preparació des de avui."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Proponent de la proposta D"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "en preparació des de ahir."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Proponent de la proposta E"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s dies en preparació."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Proponent de la proposta F"
-#~ msgid "requested today."
-#~ msgstr "demanat avui."
+#~ msgid "Seconds"
+#~ msgstr "Els que secunden"
-#~ msgid "requested yesterday."
-#~ msgstr "demanat ahir."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Els que secunden la proposta A"
-#~ msgid "requested %s days ago."
-#~ msgstr "demanat %s dies enrere."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Els que secunden la proposta B"
-#~ msgid "package info"
-#~ msgstr "informació del paquet"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Els que secunden la proposta C"
-#~ msgid "License Information"
-#~ msgstr "Informació de llicències"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Els que secunden la proposta D"
-#~ msgid "DLS Index"
-#~ msgstr "Index DLS"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Els que secunden la proposta E"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Els que secunden la proposta F"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG PMF"
+#~ msgid "Opposition"
+#~ msgstr "Oposició"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Arxiu de debian-legal"
+#~ msgid "Text"
+#~ msgstr "Text"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Proposal A"
+#~ msgstr "Proposta A"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, versió %s: %s"
+#~ msgid "Proposal B"
+#~ msgstr "Proposta B"
-#~ msgid "Date published"
-#~ msgstr "Data de publicació"
+#~ msgid "Proposal C"
+#~ msgstr "Proposta C"
-#~ msgid "License"
-#~ msgstr "Llicència"
+#~ msgid "Proposal D"
+#~ msgstr "Proposta D"
-#~ msgid "Version"
-#~ msgstr "Versió"
+#~ msgid "Proposal E"
+#~ msgstr "Proposta E"
-#~ msgid "Summary"
-#~ msgstr "Resum"
+#~ msgid "Proposal F"
+#~ msgstr "Proposta F"
-#~ msgid "Justification"
-#~ msgstr "Justificació"
+#~ msgid "Choices"
+#~ msgstr "Opcions"
-#~ msgid "Discussion"
-#~ msgstr "Discussió"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Proponent de l'esmena"
-#~ msgid "Original Summary"
-#~ msgstr "Resum original"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Els que secunden l'esmena"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "El resum original de <summary-author/> es pot trobar en els <a href="
-#~ "\"<summary-url/>\">arxius de la llista</a>."
+#~ msgid "Amendment Text"
+#~ msgstr "Text de l'esmena"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Aquest resum va ser preparat per <summary-author/>."
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Proponent de l'esmena A"
-#~ msgid "License text (translated)"
-#~ msgstr "Text de la llicència (traduït)"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Els que secunden l'esmena A"
-#~ msgid "License text"
-#~ msgstr "Text de la llicència"
+#~ msgid "Amendment Text A"
+#~ msgstr "Text de l'esmena A"
-#~ msgid "free"
-#~ msgstr "lliure"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Proponent de l'esmena B"
-#~ msgid "non-free"
-#~ msgstr "no-lliure"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Els que secunden l'esmena B"
-#~ msgid "not redistributable"
-#~ msgstr "no redistribuïble"
+#~ msgid "Amendment Text B"
+#~ msgstr "Text de l'esmena B"
-#~ msgid "Free"
-#~ msgstr "Lliure"
+#~ msgid "Amendments"
+#~ msgstr "Esmenes"
-#~ msgid "Non-Free"
-#~ msgstr "No-lliure"
+#~ msgid "Proceedings"
+#~ msgstr "Actes"
-#~ msgid "Not Redistributable"
-#~ msgstr "No redistribuïble"
+#~ msgid "Majority Requirement"
+#~ msgstr "Requeriments de majoria"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Vegeu la pagina d'<a href=\"./\">informació de llicències</a> per tal a "
-#~ "tenir una idea dels Resums de Llicències de Debian (DLS)."
+#~ msgid "Data and Statistics"
+#~ msgstr "Dades i estadístiques"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Kit de pseudo imatge"
+#~ msgid "Quorum"
+#~ msgstr "Quòrum"
-#~ msgid "Vote"
-#~ msgstr "Votar"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Discussió mínima"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Llegir un resultat"
+#~ msgid "Ballot"
+#~ msgstr "Butlleta"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Donar&nbsp;suport&nbsp;a&nbsp;una&nbsp;proposta"
+#~ msgid "Forum"
+#~ msgstr "Fòrum"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Esmenar&nbsp;una&nbsp;proposta"
+#~ msgid "Outcome"
+#~ msgstr "Resultat"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Enviar&nbsp;proposta"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "En&nbsp;espera&nbsp;de&nbsp;patrocinadors"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Com"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "En&nbsp;discussió"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Pàgina&nbsp;principal&nbsp;de&nbsp;votacions"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Votació&nbsp;en&nbsp;curs"
-#~ msgid "Other"
-#~ msgstr "Altres"
+#~ msgid "Decided"
+#~ msgstr "Decidida"
#~ msgid "Withdrawn"
#~ msgstr "Retirada"
-#~ msgid "Decided"
-#~ msgstr "Decidida"
+#~ msgid "Other"
+#~ msgstr "Altres"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Votació&nbsp;en&nbsp;curs"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Pàgina&nbsp;principal&nbsp;de&nbsp;votacions"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "En&nbsp;discussió"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Com"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "En&nbsp;espera&nbsp;de&nbsp;patrocinadors"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Enviar&nbsp;proposta"
-#~ msgid "Outcome"
-#~ msgstr "Resultat"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Esmenar&nbsp;una&nbsp;proposta"
-#~ msgid "Forum"
-#~ msgstr "Fòrum"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Donar&nbsp;suport&nbsp;a&nbsp;una&nbsp;proposta"
-#~ msgid "Ballot"
-#~ msgstr "Butlleta"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Llegir un resultat"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Discussió mínima"
+#~ msgid "Vote"
+#~ msgstr "Votar"
-#~ msgid "Quorum"
-#~ msgstr "Quòrum"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Kit de pseudo imatge"
-#~ msgid "Data and Statistics"
-#~ msgstr "Dades i estadístiques"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Vegeu la pagina d'<a href=\"./\">informació de llicències</a> per tal a "
+#~ "tenir una idea dels Resums de Llicències de Debian (DLS)."
-#~ msgid "Majority Requirement"
-#~ msgstr "Requeriments de majoria"
+#~ msgid "Not Redistributable"
+#~ msgstr "No redistribuïble"
-#~ msgid "Proceedings"
-#~ msgstr "Actes"
+#~ msgid "Non-Free"
+#~ msgstr "No-lliure"
-#~ msgid "Amendments"
-#~ msgstr "Esmenes"
+#~ msgid "Free"
+#~ msgstr "Lliure"
-#~ msgid "Amendment Text B"
-#~ msgstr "Text de l'esmena B"
+#~ msgid "not redistributable"
+#~ msgstr "no redistribuïble"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Els que secunden l'esmena B"
+#~ msgid "non-free"
+#~ msgstr "no-lliure"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Proponent de l'esmena B"
+#~ msgid "free"
+#~ msgstr "lliure"
-#~ msgid "Amendment Text A"
-#~ msgstr "Text de l'esmena A"
+#~ msgid "License text"
+#~ msgstr "Text de la llicència"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Els que secunden l'esmena A"
+#~ msgid "License text (translated)"
+#~ msgstr "Text de la llicència (traduït)"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Proponent de l'esmena A"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Aquest resum va ser preparat per <summary-author/>."
-#~ msgid "Amendment Text"
-#~ msgstr "Text de l'esmena"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "El resum original de <summary-author/> es pot trobar en els <a href="
+#~ "\"<summary-url/>\">arxius de la llista</a>."
-#~ msgid "Amendment Seconds"
-#~ msgstr "Els que secunden l'esmena"
+#~ msgid "Original Summary"
+#~ msgstr "Resum original"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Proponent de l'esmena"
+#~ msgid "Discussion"
+#~ msgstr "Discussió"
-#~ msgid "Choices"
-#~ msgstr "Opcions"
+#~ msgid "Justification"
+#~ msgstr "Justificació"
-#~ msgid "Proposal F"
-#~ msgstr "Proposta F"
+#~ msgid "Summary"
+#~ msgstr "Resum"
-#~ msgid "Proposal E"
-#~ msgstr "Proposta E"
+#~ msgid "Version"
+#~ msgstr "Versió"
-#~ msgid "Proposal D"
-#~ msgstr "Proposta D"
+#~ msgid "License"
+#~ msgstr "Llicència"
-#~ msgid "Proposal C"
-#~ msgstr "Proposta C"
+#~ msgid "Date published"
+#~ msgstr "Data de publicació"
-#~ msgid "Proposal B"
-#~ msgstr "Proposta B"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, versió %s: %s"
-#~ msgid "Proposal A"
-#~ msgstr "Proposta A"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Text"
-#~ msgstr "Text"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Arxiu de debian-legal"
-#~ msgid "Opposition"
-#~ msgstr "Oposició"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG PMF"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Els que secunden la proposta F"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Els que secunden la proposta E"
+#~ msgid "DLS Index"
+#~ msgstr "Index DLS"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Els que secunden la proposta D"
+#~ msgid "License Information"
+#~ msgstr "Informació de llicències"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Els que secunden la proposta C"
+#~ msgid "package info"
+#~ msgstr "informació del paquet"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Els que secunden la proposta B"
+#~ msgid "requested %s days ago."
+#~ msgstr "demanat %s dies enrere."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Els que secunden la proposta A"
+#~ msgid "requested yesterday."
+#~ msgstr "demanat ahir."
-#~ msgid "Seconds"
-#~ msgstr "Els que secunden"
+#~ msgid "requested today."
+#~ msgstr "demanat avui."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Proponent de la proposta F"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s dies en preparació."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Proponent de la proposta E"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "en preparació des de ahir."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Proponent de la proposta D"
+#~ msgid "in preparation since today."
+#~ msgstr "en preparació des de avui."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Proponent de la proposta C"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s dies en adopció."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Proponent de la proposta B"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "en adopció des de ahir."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Proponent de la proposta A"
+#~ msgid "in adoption since today."
+#~ msgstr "en adopció des de avui."
-#~ msgid "Proposer"
-#~ msgstr "Proponent"
+#~ msgid "No help requested"
+#~ msgstr "Sense demandes d'ajuda"
-#~ msgid "Platforms"
-#~ msgstr "Plataformes"
+#~ msgid "No Requested packages"
+#~ msgstr "Sense paquets demanats"
-#~ msgid "Debate"
-#~ msgstr "Debat"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Sense paquets esperant ser empaquetats"
-#~ msgid "Nominations"
-#~ msgstr "Nominacions"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Sense paquets esperant ser adoptats"
-#~ msgid "Time Line"
-#~ msgstr "Línia temporal"
+#~ msgid "No orphaned packages"
+#~ msgstr "Sense paquets deixats orfes"
-#~ msgid "Date"
-#~ msgstr "Data"
+#~ msgid "No requests for adoption"
+#~ msgstr "Sense demandes d'adopció"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">Llista de correu publica</a> en "
-#~ "anglès per a CDs/DVDs:"
+#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
+#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />misc"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
+#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "net_install"
-#~ msgstr "instal·lació_per_xarxa"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "buy"
-#~ msgstr "compra"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
+#~ "de correu debian-news.</a>"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Tornar a la <a href=\"./\">pàgina de conferenciants de Debian</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />pmf"
+#~ msgid "List of Speakers"
+#~ msgstr "Llista de conferenciants"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_en_cd"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Ha estat traduït per %s."
-#~ msgid "Debian CD team"
-#~ msgstr "Equip de CD de Debian"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Ha estat traduït per %s."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Informació de llançament d'imatge"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Ha estat traduït per %s."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Descàrrega amb Torrent"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Ha estat traduït per %s."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Repliques rsync"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
+#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Replicant"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
+#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Treball artístic"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Misc"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Descàrrega"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Els <a href=\"../../\">números anteriors</a> d'aquest butlletí estan "
+#~ "disponibles."
-#~ msgid "Network Install"
-#~ msgstr "Instal·lació per xarxa"
+#, fuzzy
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
+#~ "de correu debian-news.</a>"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Compra CD o DVD"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (enllaç trencat)"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Descàrrega per HTTP/FTP"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Tornar a: altres <a href=\"./\">notícies de Debian</a> || la <a href="
+#~ "\"m4_HOME/\">pàgina principal del projecte Debian</a>."
-#~ msgid "Download with Jigdo"
-#~ msgstr "Descàrrega amb Jigdo"
+#~ msgid "Download calendar entry"
+#~ msgstr "Descarrega l'entrada del calendari"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Latest News"
+#~ msgstr "Darreres notícies"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tornar a la <a href=\"./\">pàgina de consultors de Debian</a>."
+#~ msgid "Related Links"
+#~ msgstr "Enllaços relacionats"
-#~ msgid "List of Consultants"
-#~ msgstr "Llista de consultors"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordinador del</th><th>Projecte</th>"
-#~ msgid "Rating:"
-#~ msgstr "Puntuació:"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordinador principal"
-#~ msgid "Nobody"
-#~ msgstr "Ningú"
+#~ msgid "Debian Involvement"
+#~ msgstr "Participació de Debian"
-#~ msgid "Taken by:"
-#~ msgstr "Agafat per:"
+#~ msgid "More Info"
+#~ msgstr "Més informació"
-#~ msgid "More information:"
-#~ msgstr "Més informació:"
+#~ msgid "Where"
+#~ msgstr "On"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Tria un servidor a prop teu: &nbsp;"
+#~ msgid "When"
+#~ msgstr "Quan"
-#~ msgid "Report it!"
-#~ msgstr "Informa'n!"
+#~ msgid "link may no longer be valid"
+#~ msgstr "potser l'enllaç ja no és vàlid"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Heu trobat algun problema amb el disseny del lloc web?"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Properes atraccions"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Visiteu el lloc del patrocinador"
+#~ msgid "More information"
+#~ msgstr "Més informació"
diff --git a/catalan/po/vendors.ca.po b/catalan/po/vendors.ca.po
index a2f6a2a087d..69f74263c40 100644
--- a/catalan/po/vendors.ca.po
+++ b/catalan/po/vendors.ca.po
@@ -68,74 +68,74 @@ msgstr "font"
msgid "and"
msgstr "i"
-#~ msgid "updated monthly"
-#~ msgstr "actualitzat mensualment"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "actualitzat dos vegades a la setmana"
+#~ msgid "Vendor:"
+#~ msgstr "Venedor:"
-#~ msgid "updated weekly"
-#~ msgstr "actualitzat semanalment"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL de la pàgina sobre Debian:"
-#~ msgid "reseller"
-#~ msgstr "revenedor"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permet contribucions a Debian:"
-#~ msgid "reseller of $var"
-#~ msgstr "revenedor de $var"
+#~ msgid "Country:"
+#~ msgstr "Estat:"
-#~ msgid "Custom Release"
-#~ msgstr "Versió personalitzada"
+#~ msgid "Ship International:"
+#~ msgstr "Enviaments internacionals:"
-#~ msgid "vendor additions"
-#~ msgstr "afegiments del venedor"
+#~ msgid "email:"
+#~ msgstr "correu-e:"
-#~ msgid "contrib included"
-#~ msgstr "contrib inclòs"
+#~ msgid "CD Type:"
+#~ msgstr "Tipus de CD:"
-#~ msgid "non-free included"
-#~ msgstr "non-free inclòs"
+#~ msgid "DVD Type:"
+#~ msgstr "Tipus de DVD:"
-#~ msgid "non-US included"
-#~ msgstr "non-US inclòs"
+#~ msgid "Architectures:"
+#~ msgstr "Arquitectures:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Mùltiples distribucions"
+#~ msgid "Official CD"
+#~ msgstr "CD Oficial"
-#~ msgid "Vendor Release"
-#~ msgstr "Versió del venedor"
+#~ msgid "Official DVD"
+#~ msgstr "DVD Oficial"
#~ msgid "Development Snapshot"
#~ msgstr "Instantània de desenvolupament"
-#~ msgid "Official DVD"
-#~ msgstr "DVD Oficial"
+#~ msgid "Vendor Release"
+#~ msgstr "Versió del venedor"
-#~ msgid "Official CD"
-#~ msgstr "CD Oficial"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Mùltiples distribucions"
-#~ msgid "Architectures:"
-#~ msgstr "Arquitectures:"
+#~ msgid "non-US included"
+#~ msgstr "non-US inclòs"
-#~ msgid "DVD Type:"
-#~ msgstr "Tipus de DVD:"
+#~ msgid "non-free included"
+#~ msgstr "non-free inclòs"
-#~ msgid "CD Type:"
-#~ msgstr "Tipus de CD:"
+#~ msgid "contrib included"
+#~ msgstr "contrib inclòs"
-#~ msgid "email:"
-#~ msgstr "correu-e:"
+#~ msgid "vendor additions"
+#~ msgstr "afegiments del venedor"
-#~ msgid "Ship International:"
-#~ msgstr "Enviaments internacionals:"
+#~ msgid "Custom Release"
+#~ msgstr "Versió personalitzada"
-#~ msgid "Country:"
-#~ msgstr "Estat:"
+#~ msgid "reseller of $var"
+#~ msgstr "revenedor de $var"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Permet contribucions a Debian:"
+#~ msgid "reseller"
+#~ msgstr "revenedor"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL de la pàgina sobre Debian:"
+#~ msgid "updated weekly"
+#~ msgstr "actualitzat semanalment"
-#~ msgid "Vendor:"
-#~ msgstr "Venedor:"
+#~ msgid "updated twice weekly"
+#~ msgstr "actualitzat dos vegades a la setmana"
+
+#~ msgid "updated monthly"
+#~ msgstr "actualitzat mensualment"
diff --git a/chinese/po/blends.zh.po b/chinese/po/blends.zh.po
index 19139449db2..d8f8c439d5d 100644
--- a/chinese/po/blends.zh.po
+++ b/chinese/po/blends.zh.po
@@ -29,14 +29,22 @@ msgstr "衍生版"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Debian Astro(Debian 天文版)的目標是開發一個基于 Debian 的,能夠適合專業與業"
+"餘天文學家需求的操作系統。它集成了大量的軟件包,範圍涉及望遠鏡控制、數據縮"
+"減、演示和其它各個領域。"
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr "DebiChem 的目標是讓 Debian 成為化學家日常工作的優秀平台。"
-#: ../../english/blends/released.data:23
-#| msgid ""
-#| "The goal of Debian Games is to provide games in Debian from arcade and "
-#| "aventure to simulation and strategy."
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
@@ -44,7 +52,7 @@ msgstr ""
"Debian Games(Debian 遊戲版)的目標是在 Debian 中提供各類遊戲,從街機类、冒险"
"类到模擬和策略遊戲。"
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -52,7 +60,7 @@ msgstr ""
"Debian Edu(Debian 教育版)的目標是在 Debian 操作系統內提供適合學校教育活動的"
"系列軟件。"
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -60,13 +68,13 @@ msgstr ""
"Debian GIS(Debian 地理信息系統版)的目標是將 Debian 變成適合地理信息系統應用"
"程序與用戶的最佳發行版。"
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr "Debian Junior 的目標是讓 Debian 成為孩童能夠樂于使用的操作系統。"
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -77,7 +85,7 @@ msgstr ""
"開放的操作系統。為了達到這個目標,Debian Med 將醫療影像、生物信息學、門診 IT "
"基礎設施等相關的自由、開源軟件集成進入了 Debian 操作系統。"
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -85,7 +93,7 @@ msgstr ""
"Debian Multimedia(Debian 多媒體版)的目標是讓 Debian 成為完成音頻與多媒體工"
"作的良好平台。"
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -104,24 +112,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Debian Astro(Debian 天文版)的目標是開發一個基于 Debian 的,能夠適合專業與業"
-"餘天文學家需求的操作系統。它集成了大量的軟件包,範圍涉及望遠鏡控制、數據縮"
-"減、演示和其它各個領域。"
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Debian Design(Debian 設計師版)的目標是為設計師提供應用程序。它包含了圖像設"
"計、網頁設計和多媒體設計。"
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -134,7 +131,7 @@ msgstr ""
"建設能夠在更多地區開展下去,例如非洲、阿富汗、印度尼西亞、越南等地,並且所有"
"工作基于 Debian 平台。"
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -147,7 +144,7 @@ msgstr ""
"以替代無線路由器的設備上運行用來保護用戶數據私密性與安全性的洋蔥頭(Tor)中繼"
"節點。"
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -155,7 +152,7 @@ msgstr ""
"Debian Hamradio(Debian 無線電版)的目標是支持滿足無線電愛好者的需求,在 "
"Debian 內提供包括日志記錄、數據模式和包模式等等方面的應用程序。"
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -163,8 +160,8 @@ msgstr ""
"DebianParl 的目標是提供可以支持全世界各個議會議員、政治家及其下屬工作人員日常"
"工作的軟件。"
-#~ msgid "Debian Accessibility"
-#~ msgstr "Debian Accessibility(Debian 易訪問版)"
-
#~ msgid "Debian Games"
#~ msgstr "Debian Games(Debian 遊戲版)"
+
+#~ msgid "Debian Accessibility"
+#~ msgstr "Debian Accessibility(Debian 易訪問版)"
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 7f46e85dce5..739cee6f297 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -160,146 +160,146 @@ msgstr "已歸檔"
msgid "Archived and Unarchived"
msgstr "已歸檔與未歸檔"
-#~ msgid "Flags:"
-#~ msgstr "標記:"
-
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "wontfix"
+#~ msgstr "不予修正 (wontfix)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上遊 (upstream)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "不可再現 (unreproducible)"
-#~ msgid "Package version:"
-#~ msgstr "軟件包版本號:"
+#~ msgid "security"
+#~ msgstr "安全性 (security)"
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "patch"
+#~ msgstr "補丁 (patch)"
-#~ msgid "bugs"
-#~ msgstr "數量"
+#~ msgid "moreinfo"
+#~ msgstr "附加信息 (moreinfo)"
-#~ msgid "open"
-#~ msgstr "未解決"
+#~ msgid "l10n"
+#~ msgstr "本地化 (l10n)"
-#~ msgid "forwarded"
-#~ msgstr "已移交"
+#~ msgid "help"
+#~ msgstr "幫助文檔 (help)"
-#~ msgid "pending"
-#~ msgstr "待完工"
+#~ msgid "fixed-upstream"
+#~ msgstr "已修正于上遊 (fixed-upstream)"
-#~ msgid "fixed"
-#~ msgstr "已修正"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "已修正于 experimental (fixed-in-experimental)"
-#~ msgid "done"
-#~ msgstr "已完工"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "致命"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "grave"
-#~ msgstr "危險"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "serious"
-#~ msgstr "嚴重"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "重要"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "minor"
-#~ msgstr "輕微"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "wishlist"
-#~ msgstr "[CN:小意思:][HKTW:心願:]"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
#~ msgid "Include severity:"
#~ msgstr "包括優先級:"
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "wishlist"
+#~ msgstr "[CN:小意思:][HKTW:心願:]"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "輕微"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "重要"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "嚴重"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "危險"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "致命"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "done"
+#~ msgstr "已完工"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "已修正于 experimental (fixed-in-experimental)"
+#~ msgid "fixed"
+#~ msgstr "已修正"
-#~ msgid "fixed-upstream"
-#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "pending"
+#~ msgstr "待完工"
-#~ msgid "help"
-#~ msgstr "幫助文檔 (help)"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
-#~ msgid "l10n"
-#~ msgstr "本地化 (l10n)"
+#~ msgid "open"
+#~ msgstr "未解決"
-#~ msgid "moreinfo"
-#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "bugs"
+#~ msgstr "數量"
-#~ msgid "patch"
-#~ msgstr "補丁 (patch)"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
-#~ msgid "security"
-#~ msgstr "安全性 (security)"
+#~ msgid "Package version:"
+#~ msgstr "軟件包版本號:"
-#~ msgid "unreproducible"
-#~ msgstr "不可再現 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "上遊 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "不予修正 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
+
+#~ msgid "Flags:"
+#~ msgstr "標記:"
diff --git a/chinese/po/cdimage.zh.po b/chinese/po/cdimage.zh.po
index a618d7c6ec8..aca30da189b 100644
--- a/chinese/po/cdimage.zh.po
+++ b/chinese/po/cdimage.zh.po
@@ -74,7 +74,6 @@ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
msgstr "<void id=\"dc_rsyncmirrors\" />Rsync 鏡像"
#: ../../english/template/debian/cdimage.wml:43
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"dc_verify\" />验证"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 38934b1d892..95fdf076c26 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -430,8 +430,8 @@ msgstr "南非"
msgid "Zimbabwe"
msgstr "津巴布韦"
-#~ msgid "Great Britain"
-#~ msgstr "英國"
-
#~ msgid "Yugoslavia"
#~ msgstr "南斯拉夫"
+
+#~ msgid "Great Britain"
+#~ msgstr "英國"
diff --git a/chinese/po/date.zh.po b/chinese/po/date.zh.po
index ed289941980..0c99a6dd3c8 100644
--- a/chinese/po/date.zh.po
+++ b/chinese/po/date.zh.po
@@ -197,7 +197,6 @@ msgstr "q{[%]02d月[%]02d日}, $mon, $mday"
#. Percent signs are escaped because they are special during pass 2,
#. replace all % by [%]
#: ../../english/template/debian/ctime.wml:99
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
msgid "q{[%]s [%]s}, $mon_str, $year"
msgstr "q{[%]s年[%]s月}, $year, $mon"
diff --git a/chinese/po/distrib.zh.po b/chinese/po/distrib.zh.po
index fad30125ac5..bb5f08b8b3c 100644
--- a/chinese/po/distrib.zh.po
+++ b/chinese/po/distrib.zh.po
@@ -134,12 +134,10 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
-#| msgid "64-bit PC (amd64)"
msgid "64-bit ARM (AArch64)"
msgstr "64 位 ARM(AArch64)"
#: ../../english/releases/arches.data:12
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM(armel)"
@@ -180,7 +178,6 @@ msgid "MIPS (big endian)"
msgstr "MIPS(大端序)"
#: ../../english/releases/arches.data:22
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "64 位 MIPS(小端序)"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 9b39fb5f553..48df3adb613 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -31,8 +31,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -56,31 +56,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -92,7 +68,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -104,7 +80,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -112,6 +88,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "作者:"
@@ -164,13 +156,13 @@ msgstr "(version <get-var version />)"
msgid "plain text"
msgstr "純文字"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/cvs"
-"\">Subversion</a> 仓库获得。"
+"<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
@@ -198,14 +190,6 @@ msgstr ""
"<get-var srctype /> 的最新源代码可由 <a href=\"https://packages.debian.org/"
"subversion\">Subversion</a> 仓库获得。"
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"<get-var srctype /> 的最新源代码可由 <a href=\"https://packages.debian.org/"
-"git\">Git</a> 仓库获得。"
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -225,7 +209,6 @@ msgid "Debian package"
msgstr "Debian 套件"
#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian 套件(已归档)"
@@ -237,8 +220,21 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Language:"
-#~ msgstr "語言:"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
+
+#~ msgid ""
+#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+#~ msgstr ""
+#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
#~ msgid ""
#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -256,18 +252,12 @@ msgstr "PDF"
#~ "check out the sources, use the command:<br><pre>cvs -d:pserver:"
#~ "anonymous@cvs.debian.org:/cvs/debian-policy co <get-var doc /></pre>"
-#~ msgid ""
-#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-#~ msgstr ""
-#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
+#~ msgid "Language:"
+#~ msgstr "語言:"
#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
#~ msgstr ""
-#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
-#~ "檔。"
+#~ "<get-var srctype /> 的最新源代码可由 <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> 仓库获得。"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index 6025b3c05eb..ac4f0a4c2ce 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -4,15 +4,16 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2017-08-07 20:47+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2018-06-02 17:16+0800\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language: zh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.7\n"
+"POT-Creation-Date: \n"
#: ../../english/MailingLists/mklist.tags:6
msgid "Mailing List Subscription"
@@ -44,6 +45,8 @@ msgid ""
"subscriptions is limited, if your request doesn't succeed, please use <a "
"href=\"./#subunsub\">another method</a>):"
msgstr ""
+"请选择您想要订阅的列表(此处可一次性订阅的列表数量有限,如果您的请求未能成"
+"功,请尝试使用 <a href=\"./#subunsub\">其它方式</a>):"
#: ../../english/MailingLists/mklist.tags:18
msgid "No description given"
@@ -107,6 +110,8 @@ msgid ""
"unsubscriptions is limited, if your request doesn't succeed, please use <a "
"href=\"./#subunsub\">another method</a>):"
msgstr ""
+"请选择您想要取消订阅的列表(此处可一次性取消订阅的列表数量有限,如果您的请求"
+"未能成功,请尝试使用 <a href=\"./#subunsub\">其它方式</a>):"
#: ../../english/MailingLists/mklist.tags:57
msgid "Unsubscribe"
@@ -120,8 +125,8 @@ msgstr "公開"
msgid "closed"
msgstr "關閉"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "請選擇您要取消訂閱哪個列表:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "請選擇您想要訂閱的郵件列表:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "請選擇您要取消訂閱哪個列表:"
diff --git a/chinese/po/newsevents.zh.po b/chinese/po/newsevents.zh.po
index 5e83b5bfebf..4590aa6d0d6 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -360,10 +360,6 @@ msgid ""
msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
-#| msgid ""
-#| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#| "list</a>."
msgid ""
"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
"org/debian-news/\">subscribe to the debian-news mailing list</a>."
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index da42e880e57..5d09783a5ec 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -74,22 +74,22 @@ msgid "Officers"
msgstr "總管"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "發行版"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr ""
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:297
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "支援以及下級組織"
@@ -106,219 +106,219 @@ msgstr "領袖"
msgid "Technical Committee"
msgstr "技術委員會"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "秘書"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "各項開發計劃"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP 庫存"
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP 總管"
-#: ../../english/intro/organization.data:92
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP 助理"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "個別軟件包"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "釋出管理"
-#: ../../english/intro/organization.data:114
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "釋出團隊"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "品質管理"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "安裝系統小組"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "釋出公告"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "光碟映像"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "產品"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "測試"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "支援以及下級組織"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:153
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Buildd 管理"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "文件"
-#: ../../english/intro/organization.data:177
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "需要幫助的套件清單"
-#: ../../english/intro/organization.data:180
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:181
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "移植"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "特別[CN:配置:][HKTW:組態設定:]"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "筆記型電腦"
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "防火牆"
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "嵌入式系統"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "網頁"
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Debian 星球"
-#: ../../english/intro/organization.data:251
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Debian Women 計劃"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:269
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "活動"
-#: ../../english/intro/organization.data:275
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "技術委員會"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "合作計劃"
-#: ../../english/intro/organization.data:287
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "協調硬體捐贈"
-#: ../../english/intro/organization.data:300
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
-#: ../../english/intro/organization.data:367
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "錯誤追縱系統"
-#: ../../english/intro/organization.data:372
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "郵件列表管理與郵件列表庫存"
-#: ../../english/intro/organization.data:380
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "新進開發人員櫃台"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debian 帳號管理員"
-#: ../../english/intro/organization.data:391
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Keyring (PGP 與 GPG) 管理員"
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "安全團隊"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "顧問網頁"
-#: ../../english/intro/organization.data:412
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "CD 廠商網頁"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "政策"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "系統管理"
-#: ../../english/intro/organization.data:421
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -326,7 +326,7 @@ msgstr ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need apackage installed."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -336,87 +336,103 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
"contain per-machine administrator information."
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開發人員目錄管理"
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "鏡像站台"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "套件追蹤系統"
-#: ../../english/intro/organization.data:441
-msgid "Auditor"
-msgstr "監察"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth 管理"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth 管理"
-#: ../../english/intro/organization.data:463
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "給 1 到 99 歲小孩使用的 Debian"
-#: ../../english/intro/organization.data:466
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "給醫藥界使用的 Debian"
-#: ../../english/intro/organization.data:469
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "給教育界使用的 Debian"
-#: ../../english/intro/organization.data:474
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "給法律界使用的 Debian"
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "給殘障人士使用的 Debian"
-#: ../../english/intro/organization.data:482
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "給醫藥界使用的 Debian"
-#~ msgid "Testing Security Team"
-#~ msgstr "測試版安全團隊"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "給教育界使用的 Debian"
-#~ msgid "Security Audit Project"
-#~ msgstr "安全稽查計劃"
+#~ msgid "Live System Team"
+#~ msgstr "Live 系統小組"
-#~ msgid "APT Team"
-#~ msgstr "APT 小組"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian 開發人員 Keyring 團隊"
-#~ msgid "Mailing List Archives"
-#~ msgstr "郵件列表歸檔"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "客製化 Debian 發行版"
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "穩定版的釋出團隊"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "給非營利組織用的 Debian"
+#~ msgid "Vendors"
+#~ msgstr "廠商"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "使用環球作業系統作為桌面環境"
+#~ msgid "Handhelds"
+#~ msgstr "手持式設備"
-#~ msgid "Accountant"
-#~ msgstr "帳號管理"
+#~ msgid "Marketing Team"
+#~ msgstr "行銷團隊"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Key Signing 協調"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
+#~ "debian.org> 聯絡,如 <genericemail i386@buildd.debian.org>。"
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -427,33 +443,32 @@ msgstr "給醫藥界使用的 Debian"
#~ "\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 "
#~ "buildd 與管理員。"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
-#~ "debian.org> 聯絡,如 <genericemail i386@buildd.debian.org>。"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Key Signing 協調"
-#~ msgid "Marketing Team"
-#~ msgstr "行銷團隊"
+#~ msgid "Accountant"
+#~ msgstr "帳號管理"
-#~ msgid "Handhelds"
-#~ msgstr "手持式設備"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "使用環球作業系統作為桌面環境"
-#~ msgid "Vendors"
-#~ msgstr "廠商"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "給非營利組織用的 Debian"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "穩定版的釋出團隊"
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "客製化 Debian 發行版"
+#~ msgid "Mailing List Archives"
+#~ msgstr "郵件列表歸檔"
-#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian 開發人員 Keyring 團隊"
+#~ msgid "APT Team"
+#~ msgstr "APT 小組"
-#~ msgid "Live System Team"
-#~ msgstr "Live 系統小組"
+#~ msgid "Security Audit Project"
+#~ msgstr "安全稽查計劃"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "測試版安全團隊"
+
+#~ msgid "Auditor"
+#~ msgstr "監察"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index cdd58c70bf1..abded666a2d 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -1,14 +1,16 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2008-11-16 18:16+0800\n"
-"Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
+"PO-Revision-Date: 2018-06-02 17:22+0800\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
-"Language: \n"
+"Language: zh\n"
"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.0.7\n"
#: ../../english/banners/index.tags:7
msgid "Download"
@@ -59,10 +61,8 @@ msgid "Unavailable"
msgstr "未提供"
#: ../../english/devel/join/nm-steps.inc:7
-#, fuzzy
-#| msgid "New Maintainers' Corner"
msgid "New Members Corner"
-msgstr "新進人員專區"
+msgstr "新成员专区"
#: ../../english/devel/join/nm-steps.inc:10
msgid "Step 1"
@@ -108,10 +108,8 @@ msgstr ""
#: ../../english/devel/website/tc.data:14
#: ../../english/devel/website/tc.data:15
#: ../../english/devel/website/tc.data:16
-#, fuzzy
-#| msgid "Additional Information"
msgid "More information"
-msgstr "其他資訊"
+msgstr "更多信息"
#: ../../english/devel/website/tc.data:13
msgid ""
@@ -122,22 +120,16 @@ msgstr ""
"spanish/</a> (只有西班牙語)。"
#: ../../english/distrib/pre-installed.defs:18
-#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
-msgstr "電話:"
+msgstr "電話"
#: ../../english/distrib/pre-installed.defs:19
-#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
-msgstr "傳真:"
+msgstr "傳真"
#: ../../english/distrib/pre-installed.defs:21
-#, fuzzy
-#| msgid "Address:"
msgid "Address"
-msgstr "地址:"
+msgstr "地址"
#: ../../english/logos/index.data:6
msgid "With&nbsp;``Debian''"
@@ -225,11 +217,11 @@ msgstr ""
#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
-msgstr ""
+msgstr "雨伞"
#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
-msgstr ""
+msgstr "枕套"
#: ../../english/misc/merchandise.def:54
msgid "keychains"
@@ -237,11 +229,11 @@ msgstr ""
#: ../../english/misc/merchandise.def:57
msgid "Swiss army knives"
-msgstr ""
+msgstr "瑞士军刀"
#: ../../english/misc/merchandise.def:60
msgid "USB-Sticks"
-msgstr ""
+msgstr "U 盘"
#: ../../english/misc/merchandise.def:75
msgid "lanyards"
@@ -249,31 +241,31 @@ msgstr ""
#: ../../english/misc/merchandise.def:78
msgid "others"
-msgstr ""
+msgstr "其它"
#: ../../english/misc/merchandise.def:98
msgid "Donates money to Debian"
-msgstr ""
+msgstr "向 Debian 捐献"
#: ../../english/misc/merchandise.def:102
msgid "Money is used to organize local free software events"
-msgstr ""
+msgstr "财物将被用来组织本地的自由软件活动"
#: ../../english/women/profiles/profiles.def:24
msgid "How long have you been using Debian?"
-msgstr ""
+msgstr "您使用 Debian 多长时间了?"
#: ../../english/women/profiles/profiles.def:27
msgid "Are you a Debian Developer?"
-msgstr ""
+msgstr "您是否为 Debian 开发者?"
#: ../../english/women/profiles/profiles.def:30
msgid "What areas of Debian are you involved in?"
-msgstr ""
+msgstr "您参与了 Debian 中的那些方面?"
#: ../../english/women/profiles/profiles.def:33
msgid "What got you interested in working with Debian?"
-msgstr ""
+msgstr "您为什么对在 Debian 中工作产生了兴趣?"
#: ../../english/women/profiles/profiles.def:36
msgid ""
@@ -288,7 +280,7 @@ msgstr ""
#: ../../english/women/profiles/profiles.def:42
msgid "A bit more about you..."
-msgstr ""
+msgstr "关于您的更多信息..."
#: ../../english/y2k/l10n.data:6
msgid "OK"
@@ -334,74 +326,74 @@ msgstr "版本"
msgid "URL"
msgstr "網址"
-#~ msgid "Wanted:"
-#~ msgstr "希望:"
-
-#~ msgid "Who:"
-#~ msgstr "誰:"
+#~ msgid "Name:"
+#~ msgstr "姓名:"
-#~ msgid "Architecture:"
-#~ msgstr "硬體架構:"
+#~ msgid "Company:"
+#~ msgstr "公司:"
-#~ msgid "Specifications:"
-#~ msgstr "詳細資訊:"
+#~ msgid "URL:"
+#~ msgstr "網址:"
-#~ msgid "Where:"
-#~ msgstr "地點:"
+#~ msgid "or"
+#~ msgstr "或"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "Email:"
+#~ msgstr "Email:"
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid "Rates:"
+#~ msgstr "收費:"
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
+#~ "Debian 顧問。"
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "您的 E-Mail 地址:"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
+#~ msgid "Clear"
+#~ msgstr "清除"
#~ msgid ""
#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
#~ "policy</a>."
#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "您的 E-Mail 地址:"
+#~ msgid "open"
+#~ msgstr "公開"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "closed"
+#~ msgstr "關閉"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
-#~ msgid "Rates:"
-#~ msgstr "收費:"
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "Where:"
+#~ msgstr "地點:"
-#~ msgid "URL:"
-#~ msgstr "網址:"
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊:"
-#~ msgid "Company:"
-#~ msgstr "公司:"
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構:"
-#~ msgid "Name:"
-#~ msgstr "姓名:"
+#~ msgid "Who:"
+#~ msgstr "誰:"
+
+#~ msgid "Wanted:"
+#~ msgstr "希望:"
diff --git a/chinese/po/partners.zh.po b/chinese/po/partners.zh.po
index 52792a9d35f..6d1e8018a15 100644
--- a/chinese/po/partners.zh.po
+++ b/chinese/po/partners.zh.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
-"by providing hosting services and sponsorship for the Debian Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
-"are also well known for their expert and friendly support."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index c9632acdad0..fe9b8fa4e03 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -1,6 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2017-08-09 11:14+0800\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -9,7 +10,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.0.3\n"
#: ../../english/ports/alpha/menu.inc:6
@@ -116,32 +116,32 @@ msgstr "給 PowerPC 用的 Debian"
msgid "Debian for Sparc"
msgstr "給 Sparc 用的 Debian"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "給 Sparc64 用的 Debian"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "給 S/390 用的 Debian"
+#~ msgid "Debian for Laptops"
+#~ msgstr "給筆記型電腦用的 Debian"
-#~ msgid "Debian for MIPS"
-#~ msgstr "給 MIPS 用的 Debian"
+#~ msgid "Debian for AMD64"
+#~ msgstr "給 AMD64 用的 Debian"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "給 Motorola 680x0 用的 Debian"
+#~ msgid "Debian for ARM"
+#~ msgstr "給 ARM 用的 Debian"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "給 Beowulf 用的 Debian"
#~ msgid "Main"
#~ msgstr "主要"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "給 Beowulf 用的 Debian"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "給 ARM 用的 Debian"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "給 Motorola 680x0 用的 Debian"
-#~ msgid "Debian for AMD64"
-#~ msgstr "給 AMD64 用的 Debian"
+#~ msgid "Debian for MIPS"
+#~ msgstr "給 MIPS 用的 Debian"
-#~ msgid "Debian for Laptops"
-#~ msgstr "給筆記型電腦用的 Debian"
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index 9a87d5bc37a..145feaba425 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -2,6 +2,14 @@ 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: Boyuan Yang <073plan@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Language: zh\n"
+"X-Generator: Poedit 2.0.7\n"
#: ../../english/template/debian/stats_tags.wml:6
msgid "Debian web site translation statistics"
@@ -19,216 +27,225 @@ msgstr "一共有 %d [CN:字節:][HKTW:位元组:]需要翻譯。"
msgid "There are %d strings to translate."
msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
-msgstr "此譯文太過時了"
-
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "譯文版本錯誤"
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "此譯文太過時了"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "原文比此譯文新"
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "原文不再存在"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
-msgstr ""
+msgstr "合并差异"
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
+msgstr "带颜色差异"
+
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr "提交差异"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
msgstr ""
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
-msgstr ""
+msgstr "使用 <transstatslink> 创建"
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "翻譯概要 for"
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "未翻譯"
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "過時"
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "已翻譯"
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "最新"
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "個[CN:文件:][HKTW:檔案:]"
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "[CN:字節:][HKTW:位元組:]"
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "過時的翻譯"
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "[CN:文件:][HKTW:檔案:]"
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "備註"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "日誌"
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "譯文"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "維護者"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "狀態"
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "翻譯者"
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "日期"
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "已翻譯頁面 (最新)"
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "已翻譯模板 (PO [CN:文件:][HKTW:檔案:])"
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "PO 翻譯統計"
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "模糊"
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "未翻譯"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
#, fuzzy
#| msgid "Total:"
msgid "Total"
msgstr "總數:"
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "總數:"
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "已翻譯網頁"
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "翻譯統計,按頁面數量"
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "語言"
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "翻譯"
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "已翻譯網頁(按[CN:文件:][HKTW:檔案:]大小)"
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "翻譯統計,按頁面大小"
-#~ msgid "Origin"
-#~ msgstr "原文"
-
#~ msgid "Created with"
#~ msgstr "此網頁創建工具:"
+
+#~ msgid "Origin"
+#~ msgstr "原文"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index d0390cfe75c..81a4e5957b0 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2017-08-21 15:30+0800\n"
+"PO-Revision-Date: 2018-06-02 17:17+0800\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Chinese (Simplified) <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh\n"
@@ -13,10 +13,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.7\n"
+"POT-Creation-Date: \n"
#: ../../english/search.xml.in:7
-#| msgid "Debian Project"
msgid "Debian website"
msgstr "Debian 网站"
@@ -26,7 +26,6 @@ msgstr "搜索 Debian 网站。"
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Debian"
@@ -47,10 +46,6 @@ msgid "Debian Project"
msgstr "Debian 計劃"
#: ../../english/template/debian/common_translation.wml:13
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -112,7 +107,7 @@ msgstr "[CN:支持:][HKTW:支援:]"
#: ../../english/template/debian/common_translation.wml:52
msgid "Pure Blends"
-msgstr ""
+msgstr "Pure Blends"
#: ../../english/template/debian/common_translation.wml:55
#: ../../english/template/debian/links.tags.wml:46
@@ -157,7 +152,6 @@ msgid "Getting Debian"
msgstr "取得 Debian"
#: ../../english/template/debian/common_translation.wml:85
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Debian 博客"
@@ -207,22 +201,19 @@ msgstr "release 2.2 中"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
-"回報本網頁的問題,請寄信到 <a href=\"mailto:debian-www@lists.debian.org"
-"\">debian-www@lists.debian.org</a>。其他聯絡訊息請看 Debian <a href="
-"\"m4_HOME/contact\">联系方式</a>。网站的源代码在<a href=\"m4_HOME/devel/"
-"website/using_cvs\">此</a>。"
+"回報本網頁的問題,請使用英文寄信到 <a href=\"mailto:debian-www@lists.debian."
+"org\">debian-www@lists.debian.org</a>。请向 <a href=\"mailto:debian-l10n-"
+"chinese@lists.debian.org\">debian-l10n-chinese@lists.debian.org</a> 报告网站"
+"中文翻译的问题。其他聯絡訊息請看 Debian <a href=\"m4_HOME/contact\">联系方式"
+"</a>。网站的源代码可<a href=\"https://salsa.debian.org/webmaster-team/webwml"
+"\">在此处找到</a>。"
#: ../../english/template/debian/footer.wml:108
msgid "Last Modified"
@@ -302,7 +293,6 @@ msgid "Debian Books"
msgstr "Debian 書籍"
#: ../../english/template/debian/links.tags.wml:37
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Debian Wiki"
@@ -335,7 +325,6 @@ msgid "Developer Database"
msgstr "開發人員[CN:數據:][HKTW:資料:]庫"
#: ../../english/template/debian/links.tags.wml:64
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Debian FAQ"
@@ -444,7 +433,6 @@ msgid "Debian Developer's Packages Overview"
msgstr "Debian Developers's 套件綜覽"
#: ../../english/template/debian/navbar.wml:10
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Debian 主页"
@@ -513,6 +501,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<strong>註:</strong>此網頁的原英文本已經不存在了。"
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr "错误的翻译版本!"
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "網址"
@@ -521,97 +513,169 @@ msgstr "網址"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-#~ msgid "Select a server near you"
-#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
-#~ msgid "More information:"
-#~ msgstr "更多訊息:"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
-#~ msgid "Taken by:"
-#~ msgstr "認領:"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
-#~ msgid "Nobody"
-#~ msgstr "沒有人"
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-#~ msgid "Rating:"
-#~ msgstr "評分:"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Where"
-#~ msgstr "Where(何處*)"
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "捐款"
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>計劃</th><th>Coordinator</th>"
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "討論中"
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "有待贊助"
-#~ msgid "Latest News"
-#~ msgstr "最新消息"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "討論中"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "接受投票中"
+
+#~ msgid "Decided"
+#~ msgstr "已決定"
+
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"
+
+#~ msgid "Vote"
+#~ msgstr "投票"
-#, fuzzy
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
+#~ "負責編輯。"
+
+#~ msgid "Fixed in"
+#~ msgstr "修改於"
+
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"
+
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
+#~ "絡:]。"
+
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "無"
+
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+
+#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "受影響的軟件"
+
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
#~ msgid ""
#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
@@ -620,163 +684,91 @@ msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
#, fuzzy
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "受影響的軟件"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "討論中"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "無"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "購買預製映像"
-
-#~ msgid "download with pik"
-#~ msgstr "用 pik 下載"
-
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
-#~ "絡:]。"
-
-#~ msgid "Vulnerable"
-#~ msgstr "可被襲擊"
-
-#~ msgid "Fixed in"
-#~ msgstr "修改於"
-
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
-#~ "負責編輯。"
-
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-
-#~ msgid "Vote"
-#~ msgstr "投票"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
-
-#~ msgid "Other"
-#~ msgstr "其他"
-
-#~ msgid "Decided"
-#~ msgstr "已決定"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "接受投票中"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "討論中"
+#~ msgid "Latest News"
+#~ msgstr "最新消息"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "有待贊助"
+#~ msgid "Related Links"
+#~ msgstr "相關網址"
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>計劃</th><th>Coordinator</th>"
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "More Info"
+#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
+#~ msgid "Where"
+#~ msgstr "Where(何處*)"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "More information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Rating:"
+#~ msgstr "評分:"
-#~ msgid "Debian CD team"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+#~ msgid "Nobody"
+#~ msgstr "沒有人"
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "網絡安裝"
+#~ msgid "Taken by:"
+#~ msgstr "認領:"
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "透過 http/ftp 下載"
+#~ msgid "More information:"
+#~ msgstr "更多訊息:"
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "用 jigdo 下載"
+#~ msgid "Select a server near you"
+#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
+#~ msgid "Visit the site sponsor"
+#~ msgstr "[CN:訪問:][HKTW:拜訪:]本站贊助商"
diff --git a/chinese/po/vendors.zh.po b/chinese/po/vendors.zh.po
index d7d752429d9..a5967fb766e 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -23,7 +23,6 @@ msgid "Allows Contributions"
msgstr "有否捐贈"
#: ../../english/CD/vendors/vendors.CD.def:16
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
@@ -69,74 +68,74 @@ msgstr "源碼"
msgid "and"
msgstr "和"
-#~ msgid "Vendor:"
-#~ msgstr "銷售商:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "為 Debian 而設的網址:"
+#~ msgid "updated monthly"
+#~ msgstr "每月更新"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "有否捐贈給 Debian:"
+#~ msgid "updated twice weekly"
+#~ msgstr "每兩週更新"
-#~ msgid "Country:"
-#~ msgstr "國家:"
+#~ msgid "updated weekly"
+#~ msgstr "每週更新"
-#~ msgid "Ship International:"
-#~ msgstr "是否接受國際訂購:"
+#~ msgid "reseller"
+#~ msgstr "分銷商"
-#~ msgid "email:"
-#~ msgstr "電子郵箱:"
+#~ msgid "reseller of $var"
+#~ msgstr "$var 的分銷商"
-#~ msgid "CD Type:"
-#~ msgstr "CD 種類:"
+#~ msgid "Custom Release"
+#~ msgstr "特別訂造"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD 種類:"
+#~ msgid "vendor additions"
+#~ msgstr "銷售商增添軟件"
-#~ msgid "Architectures:"
-#~ msgstr "硬體架構:"
+#~ msgid "contrib included"
+#~ msgstr "包括 contrib"
-#~ msgid "Official CD"
-#~ msgstr "正式 CD 光碟"
+#~ msgid "non-free included"
+#~ msgstr "包括 non-free"
-#~ msgid "Official DVD"
-#~ msgstr "正式 DVD 光碟"
+#~ msgid "non-US included"
+#~ msgstr "包括 non-US"
-#~ msgid "Development Snapshot"
-#~ msgstr "開發版快照"
+#~ msgid "Multiple Distribution"
+#~ msgstr "多重發佈"
#~ msgid "Vendor Release"
#~ msgstr "銷售商發行版本"
-#~ msgid "Multiple Distribution"
-#~ msgstr "多重發佈"
+#~ msgid "Development Snapshot"
+#~ msgstr "開發版快照"
-#~ msgid "non-US included"
-#~ msgstr "包括 non-US"
+#~ msgid "Official DVD"
+#~ msgstr "正式 DVD 光碟"
-#~ msgid "non-free included"
-#~ msgstr "包括 non-free"
+#~ msgid "Official CD"
+#~ msgstr "正式 CD 光碟"
-#~ msgid "contrib included"
-#~ msgstr "包括 contrib"
+#~ msgid "Architectures:"
+#~ msgstr "硬體架構:"
-#~ msgid "vendor additions"
-#~ msgstr "銷售商增添軟件"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 種類:"
-#~ msgid "Custom Release"
-#~ msgstr "特別訂造"
+#~ msgid "CD Type:"
+#~ msgstr "CD 種類:"
-#~ msgid "reseller of $var"
-#~ msgstr "$var 的分銷商"
+#~ msgid "email:"
+#~ msgstr "電子郵箱:"
-#~ msgid "reseller"
-#~ msgstr "分銷商"
+#~ msgid "Ship International:"
+#~ msgstr "是否接受國際訂購:"
-#~ msgid "updated weekly"
-#~ msgstr "每週更新"
+#~ msgid "Country:"
+#~ msgstr "國家:"
-#~ msgid "updated twice weekly"
-#~ msgstr "每兩週更新"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "有否捐贈給 Debian:"
-#~ msgid "updated monthly"
-#~ msgstr "每月更新"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "為 Debian 而設的網址:"
+
+#~ msgid "Vendor:"
+#~ msgstr "銷售商:"
diff --git a/chinese/po/vote.zh.po b/chinese/po/vote.zh.po
index 74b44637669..dc9d0eb755c 100644
--- a/chinese/po/vote.zh.po
+++ b/chinese/po/vote.zh.po
@@ -1,6 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2017-08-09 11:22+0800\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -9,7 +10,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.0.3\n"
#: ../../english/template/debian/votebar.wml:13
diff --git a/chinese/po/wnpp.zh.po b/chinese/po/wnpp.zh.po
index fe7cf581e39..b3c61556abe 100644
--- a/chinese/po/wnpp.zh.po
+++ b/chinese/po/wnpp.zh.po
@@ -1,6 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2017-08-09 11:21+0800\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -9,7 +10,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.0.3\n"
#: ../../english/template/debian/wnpp.wml:8
diff --git a/croatian/po/distrib.hr.po b/croatian/po/distrib.hr.po
index 9799bdf59d3..3d7ce652325 100644
--- a/croatian/po/distrib.hr.po
+++ b/croatian/po/distrib.hr.po
@@ -208,35 +208,35 @@ msgstr ""
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Search case sensitive"
-#~ msgstr "Ne mari za velika/mala slova"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "pakete koji sadrže datoteke ili direktorije s ovakvim imenom"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Dopusti pretraživanje podriječi"
+#~ msgid "all files in this package"
+#~ msgstr "sve datoteke u ovom paketu"
-#~ msgid "yes"
-#~ msgstr "da"
+#~ msgid "Case sensitive"
+#~ msgstr "Osjetljivo na velika/mala slova"
#~ msgid "no"
#~ msgstr "ne"
-#~ msgid "Case sensitive"
-#~ msgstr "Osjetljivo na velika/mala slova"
+#~ msgid "yes"
+#~ msgstr "da"
-#~ msgid "all files in this package"
-#~ msgstr "sve datoteke u ovom paketu"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Dopusti pretraživanje podriječi"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "pakete koji sadrže datoteke ili direktorije s ovakvim imenom"
+#~ msgid "Search case sensitive"
+#~ msgstr "Ne mari za velika/mala slova"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
diff --git a/croatian/po/doc.hr.po b/croatian/po/doc.hr.po
index f4c626ae4f7..864fb046736 100644
--- a/croatian/po/doc.hr.po
+++ b/croatian/po/doc.hr.po
@@ -151,10 +151,10 @@ msgstr "(inačica <get-var version />)"
msgid "plain text"
msgstr "običan tekst"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -179,12 +179,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -218,12 +212,12 @@ msgstr ""
msgid "PDF"
msgstr ""
-#~ msgid "Language:"
-#~ msgstr "Jezik:"
-
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "Koristite <a href=\"cvs\">SVN</a> za prijenos izvornog teksta u SGML-u za "
#~ "<get-var ddp_pkg_loc />."
+
+#~ msgid "Language:"
+#~ msgstr "Jezik:"
diff --git a/croatian/po/mailinglists.hr.po b/croatian/po/mailinglists.hr.po
index 9ea8fb4bd88..cb0e3474de3 100644
--- a/croatian/po/mailinglists.hr.po
+++ b/croatian/po/mailinglists.hr.po
@@ -124,8 +124,8 @@ msgstr "otvorena"
msgid "closed"
msgstr "zatvorena"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Molimo odaberite liste na koje se želite pretplatiti:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
diff --git a/croatian/po/organization.hr.po b/croatian/po/organization.hr.po
index ba94fb66daa..78dfa4a1bcb 100644
--- a/croatian/po/organization.hr.po
+++ b/croatian/po/organization.hr.po
@@ -405,40 +405,39 @@ msgstr "Debian za medicinsku praksu i istraživanje"
msgid "Debian for astronomy"
msgstr "Debian za obrazovanje"
-#~ msgid "Testing Security Team"
-#~ msgstr "Sigurnosni tim za <q>testing</q>"
+#, fuzzy
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "Tim za instalacijski sustav"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projekt Security Audit"
+#~ msgid "Auditor"
+#~ msgstr "Revizor"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Ovo još nije službeni interni projekt u Debianu ali su najavili namjeru "
-#~ "integracije."
+#~ msgid "Publicity"
+#~ msgstr "Publicitet"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian za neprofitne organizacije"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian Maintainer keyring tim"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Univerzalni operativni sustav kao vaš desktop"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Prilagođene Debian distribucije"
-#~ msgid "Accountant"
-#~ msgstr "Knjigovođa"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Tim za izdanje <q>stable</q>"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinacija potpisivanja ključeva"
+#~ msgid "Vendors"
+#~ msgstr "Distributeri"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Imena pojedinih administratora builddova se mogu naći i na <a href="
-#~ "\"http://www.buildd.net\">http://www.buildd.net</a>. Odaberite "
-#~ "arhitekturu i distribuciju kako bi vidjeli dostupne builddove i njihove "
-#~ "administratore."
+#~ msgid "APT Team"
+#~ msgstr "APT tim"
+
+#~ msgid "Handhelds"
+#~ msgstr "Ručna računala (dlanovnici)"
+
+#~ msgid "Marketing Team"
+#~ msgstr "Marketing tim"
#~ msgid ""
#~ "The admins responsible for buildd's for a particular arch can be reached "
@@ -449,36 +448,37 @@ msgstr "Debian za obrazovanje"
#~ "mogu dobiti na <genericemail arch@buildd.debian.org>, npr. <genericemail "
#~ "i386@buildd.debian.org>."
-#~ msgid "Marketing Team"
-#~ msgstr "Marketing tim"
-
-#~ msgid "Handhelds"
-#~ msgstr "Ručna računala (dlanovnici)"
-
-#~ msgid "APT Team"
-#~ msgstr "APT tim"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Imena pojedinih administratora builddova se mogu naći i na <a href="
+#~ "\"http://www.buildd.net\">http://www.buildd.net</a>. Odaberite "
+#~ "arhitekturu i distribuciju kako bi vidjeli dostupne builddove i njihove "
+#~ "administratore."
-#~ msgid "Vendors"
-#~ msgstr "Distributeri"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinacija potpisivanja ključeva"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Tim za izdanje <q>stable</q>"
+#~ msgid "Accountant"
+#~ msgstr "Knjigovođa"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Prilagođene Debian distribucije"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Univerzalni operativni sustav kao vaš desktop"
-#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian Maintainer keyring tim"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian za neprofitne organizacije"
-#~ msgid "Publicity"
-#~ msgstr "Publicitet"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Ovo još nije službeni interni projekt u Debianu ali su najavili namjeru "
+#~ "integracije."
-#~ msgid "Auditor"
-#~ msgstr "Revizor"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt Security Audit"
-#, fuzzy
-#~| msgid "Installation System Team"
-#~ msgid "Live System Team"
-#~ msgstr "Tim za instalacijski sustav"
+#~ msgid "Testing Security Team"
+#~ msgstr "Sigurnosni tim za <q>testing</q>"
diff --git a/croatian/po/others.hr.po b/croatian/po/others.hr.po
index 57914bcff04..48d3b13bf6e 100644
--- a/croatian/po/others.hr.po
+++ b/croatian/po/others.hr.po
@@ -333,174 +333,174 @@ msgstr "Verzija"
msgid "URL"
msgstr "URL"
-#~ msgid "Wanted:"
-#~ msgstr "Traži se:"
+#~ msgid "p<get-var page />"
+#~ msgstr "str. <get-var page />"
-#~ msgid "Who:"
-#~ msgstr "Tko:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Pretplata na mailing liste"
-#~ msgid "Architecture:"
-#~ msgstr "Arhitektura:"
+#~ msgid ""
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ msgstr ""
+#~ "Pogledajte stranicu <a href=\"./#subunsub\">mailing lista</a> za "
+#~ "informacije o tome kako se pretplatiti koristeći e-mail. Dostupan je i <a "
+#~ "href=\"unsubscribe\">web formular za otkazivanje pretplate</a>, kako "
+#~ "biste prekinuli pretplatu s mailing lista. "
-#~ msgid "Specifications:"
-#~ msgstr "Specifikacije:"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "Primijetite da su većina Debian mailing lista javni forumi. Svi e-mailovi "
+#~ "koji se pošalju na njih će se objaviti na javnoj arhivi mailing lista i "
+#~ "indeksirat će ih internetski pretraživači. Na Debianove mailing liste se "
+#~ "trebate pretplatiti samo koristeći e-mail adresu za koju vam nije bitno "
+#~ "hoće li se objaviti."
-#~ msgid "Where:"
-#~ msgstr "Gdje:"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Molimo odaberite liste na koje se želite pretplatiti:"
-#~ msgid "Name:"
-#~ msgstr "Ime:"
+#~ msgid "No description given"
+#~ msgstr "Opis nije dan"
-#~ msgid "Company:"
-#~ msgstr "Poduzeće:"
+#~ msgid "Moderated:"
+#~ msgstr "Moderirana:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Slanje poruka dozvoljeno samo pretplatnicima."
-#~ msgid "or"
-#~ msgstr "ili"
+#~ msgid ""
+#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ msgstr ""
+#~ "Samo poruke koje potpiše Debian razvijatelj će biti propuštene na ovu "
+#~ "listu."
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
+#~ msgid "Subscription:"
+#~ msgstr "Pretplata:"
-#~ msgid "Rates:"
-#~ msgstr "Cijene:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "je digest inačica koju samo možete čitati."
-#~ msgid "Willing to Relocate"
-#~ msgstr "Spremni putovati"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Vaša e-mail adresa:"
+
+#~ msgid "Subscribe"
+#~ msgstr "Pretplata"
+
+#~ msgid "Clear"
+#~ msgstr "Isprazni"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "<: if (<total_consultant> % 10 == 0 or <total_consultant> % 10 > 4 or "
-#~ "(<total_consultant> > 10 and <total_consultant> < 20)) { print \"Navedeno "
-#~ "je <total_consultant> Debian konzultanata\"; } elsif (<total_consultant> "
-#~ "% 10 == 1) { print \"Naveden je <total_consultant> Debian konzultant\"; } "
-#~ "else { print \"Navedena su <total_consultant> Debian konzultanta\"; } "
-#~ "print \" iz <total_country> \" . ((<total_country> % 10 == 0 or "
-#~ "<total_country> % 10 > 4 or (<total_country> > 10 and <total_country> < "
-#~ "20)) ? \"zemalja\" : \"zemlje\") . \" širom svijeta.\" . \"\\n\"; :>"
+#~ "Molimo poštujte <a href=\"./#ads\">načela oglašavanja na Debian mailing "
+#~ "listama</a>."
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "okomiti&nbsp;natpis"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Otkazivanje pretplate na mailing liste"
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "vodoravni&nbsp;natpis"
+#~ msgid ""
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ msgstr ""
+#~ "Pogledajte stranicu <a href=\"./#subunsub\">mailing lista</a> za "
+#~ "informacije o tome kako otkazati pretplatu koristeći e-mail. Dostupan je "
+#~ "i <a href=\"subscribe\">web formular za pretplatu</a>, kako biste se "
+#~ "pretplatili na mailing liste. "
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "animirani&nbsp;GIF&nbsp;natpis"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
-#~ msgid "Newer Debian banners"
-#~ msgstr "Noviji Debian natpisi"
+#~ msgid "Unsubscribe"
+#~ msgstr "Otkaži pretplatu"
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get into it."
+#~ msgid "open"
+#~ msgstr "otvorena"
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: the potato has landed. announcing version 2.2"
+#~ msgid "closed"
+#~ msgstr "zatvorena"
-#~ msgid "Older Debian banners"
-#~ msgstr "Stariji Debian natpisi"
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
+#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
-#~ msgid "Debian: The biggest is still the best."
+#~ msgid "Debian: The Perfect OS"
#~ msgstr "Debian: The biggest is still the best."
-#~ msgid "Debian: The Perfect OS"
+#~ msgid "Debian: The biggest is still the best."
#~ msgstr "Debian: The biggest is still the best."
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
-#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
+#~ msgid "Older Debian banners"
+#~ msgstr "Stariji Debian natpisi"
-#~ msgid "closed"
-#~ msgstr "zatvorena"
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: the potato has landed. announcing version 2.2"
-#~ msgid "open"
-#~ msgstr "otvorena"
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get into it."
-#~ msgid "Unsubscribe"
-#~ msgstr "Otkaži pretplatu"
+#~ msgid "Newer Debian banners"
+#~ msgstr "Noviji Debian natpisi"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "animirani&nbsp;GIF&nbsp;natpis"
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
-#~ msgstr ""
-#~ "Pogledajte stranicu <a href=\"./#subunsub\">mailing lista</a> za "
-#~ "informacije o tome kako otkazati pretplatu koristeći e-mail. Dostupan je "
-#~ "i <a href=\"subscribe\">web formular za pretplatu</a>, kako biste se "
-#~ "pretplatili na mailing liste. "
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "vodoravni&nbsp;natpis"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Otkazivanje pretplate na mailing liste"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "okomiti&nbsp;natpis"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Molimo poštujte <a href=\"./#ads\">načela oglašavanja na Debian mailing "
-#~ "listama</a>."
-
-#~ msgid "Clear"
-#~ msgstr "Isprazni"
-
-#~ msgid "Subscribe"
-#~ msgstr "Pretplata"
+#~ "<: if (<total_consultant> % 10 == 0 or <total_consultant> % 10 > 4 or "
+#~ "(<total_consultant> > 10 and <total_consultant> < 20)) { print \"Navedeno "
+#~ "je <total_consultant> Debian konzultanata\"; } elsif (<total_consultant> "
+#~ "% 10 == 1) { print \"Naveden je <total_consultant> Debian konzultant\"; } "
+#~ "else { print \"Navedena su <total_consultant> Debian konzultanta\"; } "
+#~ "print \" iz <total_country> \" . ((<total_country> % 10 == 0 or "
+#~ "<total_country> % 10 > 4 or (<total_country> > 10 and <total_country> < "
+#~ "20)) ? \"zemalja\" : \"zemlje\") . \" širom svijeta.\" . \"\\n\"; :>"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Vaša e-mail adresa:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Spremni putovati"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "je digest inačica koju samo možete čitati."
+#~ msgid "Rates:"
+#~ msgstr "Cijene:"
-#~ msgid "Subscription:"
-#~ msgstr "Pretplata:"
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
-#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
-#~ msgstr ""
-#~ "Samo poruke koje potpiše Debian razvijatelj će biti propuštene na ovu "
-#~ "listu."
+#~ msgid "or"
+#~ msgstr "ili"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Slanje poruka dozvoljeno samo pretplatnicima."
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Moderated:"
-#~ msgstr "Moderirana:"
+#~ msgid "Company:"
+#~ msgstr "Poduzeće:"
-#~ msgid "No description given"
-#~ msgstr "Opis nije dan"
+#~ msgid "Name:"
+#~ msgstr "Ime:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Molimo odaberite liste na koje se želite pretplatiti:"
+#~ msgid "Where:"
+#~ msgstr "Gdje:"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Primijetite da su većina Debian mailing lista javni forumi. Svi e-mailovi "
-#~ "koji se pošalju na njih će se objaviti na javnoj arhivi mailing lista i "
-#~ "indeksirat će ih internetski pretraživači. Na Debianove mailing liste se "
-#~ "trebate pretplatiti samo koristeći e-mail adresu za koju vam nije bitno "
-#~ "hoće li se objaviti."
+#~ msgid "Specifications:"
+#~ msgstr "Specifikacije:"
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
-#~ msgstr ""
-#~ "Pogledajte stranicu <a href=\"./#subunsub\">mailing lista</a> za "
-#~ "informacije o tome kako se pretplatiti koristeći e-mail. Dostupan je i <a "
-#~ "href=\"unsubscribe\">web formular za otkazivanje pretplate</a>, kako "
-#~ "biste prekinuli pretplatu s mailing lista. "
+#~ msgid "Architecture:"
+#~ msgstr "Arhitektura:"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Pretplata na mailing liste"
+#~ msgid "Who:"
+#~ msgstr "Tko:"
-#~ msgid "p<get-var page />"
-#~ msgstr "str. <get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "Traži se:"
diff --git a/croatian/po/ports.hr.po b/croatian/po/ports.hr.po
index be61252d1a5..85162de8aa6 100644
--- a/croatian/po/ports.hr.po
+++ b/croatian/po/ports.hr.po
@@ -113,38 +113,38 @@ msgstr "Debian za PowerPC"
msgid "Debian for Sparc"
msgstr "Debian za Sparc"
-#~ msgid "Vendor/Name"
-#~ msgstr "Proizvođač/Ime"
-
-#~ msgid "Date announced"
-#~ msgstr "Datum najave"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian za prijenosnike"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian za Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian za AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian za S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian za ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian za MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian za Beowulf"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian za Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Glavna stranica"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Main"
-#~ msgstr "Glavna stranica"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian za Motorola 680x0"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian za Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian za MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian za ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian za S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian za AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian za Sparc64"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian za prijenosnike"
+#~ msgid "Date announced"
+#~ msgstr "Datum najave"
+
+#~ msgid "Vendor/Name"
+#~ msgstr "Proizvođač/Ime"
diff --git a/croatian/po/stats.hr.po b/croatian/po/stats.hr.po
index 6c711ffa988..2ed21da26e8 100644
--- a/croatian/po/stats.hr.po
+++ b/croatian/po/stats.hr.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/croatian/po/templates.hr.po b/croatian/po/templates.hr.po
index be8996cc0a8..7e4e7cca274 100644
--- a/croatian/po/templates.hr.po
+++ b/croatian/po/templates.hr.po
@@ -211,11 +211,11 @@ msgstr "u verziji 2.2"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Kako bi prijavili problem s webom, pošaljite e-mail <em>na engleskom jeziku</"
"em> na adresu <a href=\"mailto:debian-www@lists.debian.org\">debian-"
@@ -519,6 +519,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Pažnja:</em> Originalni dokument za ovaj prijevod više ne postoji."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -527,494 +531,494 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Povratak na stranicu <a href=\"../\">Who's using Debian?</a>."
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Posjetite pokrovitelja stranica"
-
-#~ msgid "Select a server near you"
-#~ msgstr "Izaberite vama blizak poslužitelj"
-
-#~ msgid "More information:"
-#~ msgstr "Više informacija:"
+#~ msgid "List of Consultants"
+#~ msgstr "Popis konzultanata"
-#~ msgid "Taken by:"
-#~ msgstr "Zauzeo:"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Natrag na stranicu <a href=\"./\">Debian konzultanti</a>."
-#~ msgid "Nobody"
-#~ msgstr "Nitko"
+#~ msgid "License Information"
+#~ msgstr "Informacije o licenci"
-#~ msgid "Rating:"
-#~ msgstr "Ocjena:"
+#~ msgid "DLS Index"
+#~ msgstr "DLS indeks"
-#~ msgid "More information"
-#~ msgstr "Podrobnije informacije"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Nadolazeće atrakcije"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "link may no longer be valid"
-#~ msgstr "veza možda više ne radi"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal arhiva"
-#~ msgid "When"
-#~ msgstr "Kada"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Where"
-#~ msgstr "Gdje"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, inačica %s: %s"
-#~ msgid "More Info"
-#~ msgstr "Podrobnije informacije"
+#~ msgid "Date published"
+#~ msgstr "Datum objave"
-#~ msgid "Debian Involvement"
-#~ msgstr "Upletenost Debiana"
+#~ msgid "License"
+#~ msgstr "Licenca"
-#~ msgid "Main Coordinator"
-#~ msgstr "Glavni koordinator"
+#~ msgid "Version"
+#~ msgstr "Inačica"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
+#~ msgid "Summary"
+#~ msgstr "Sažetak"
-#~ msgid "Related Links"
-#~ msgstr "Srodne veze"
+#~ msgid "Justification"
+#~ msgstr "Opravdanje"
-#~ msgid "Latest News"
-#~ msgstr "Najnovije vijesti"
+#~ msgid "Discussion"
+#~ msgstr "Rasprava"
-#~ msgid "Download calendar entry"
-#~ msgstr "Prijenos unosa u kalendar"
+#~ msgid "Original Summary"
+#~ msgstr "Originalni sažetak"
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
#~ msgstr ""
-#~ "Povratak na: druge <a href=\"./\">vijesti o Debianu</a> || <a href="
-#~ "\"m4_HOME/\">početnu stranicu Debian projekta</a>."
+#~ "Originalni sažetak kojeg je napisao <summary-author/> može se naći u <a "
+#~ "href=\"<summary-url/>\">arhivama mailing lista</a>."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (mrtav link)"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Ovaj sažetak je pripremio <summary-author/>."
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Kako bi dobili ove vijesti svako dva tjedna u svoj elektronski poštanski "
-#~ "pretinac, <a href=\"https://lists.debian.org/debian-news/\">pretplatite "
-#~ "se na debian-news mailing listu.</a>"
+#~ msgid "License text (translated)"
+#~ msgstr "Tekst licence (preveden)"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "<a href=\"../../\">Prijašnja izdanja</a> ovih vijesti su dostupna."
+#~ msgid "License text"
+#~ msgstr "Tekst licence"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Project News uređuje <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "free"
+#~ msgstr "slobodan"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Project News uređuju <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "non-free"
+#~ msgstr "neslobodan"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Ovo izdanje Debian Project News je uredio <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "not redistributable"
+#~ msgstr "ne može se redistribuirati"
+
+#~ msgid "Free"
+#~ msgstr "Slobodan"
+
+#~ msgid "Non-Free"
+#~ msgstr "Neslobodan"
+
+#~ msgid "Not Redistributable"
+#~ msgstr "Ne može se redistribuirati"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
#~ msgstr ""
-#~ "<void id=\"plural\" />Ovo izdanje Debian Project News su uredili <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "Pogledajte stranicu <a href=\"./\">informacije o licencama</a> za pregled "
+#~ "Debian License Summaries (DLS)."
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Preveo %s."
+#~ msgid "Vote"
+#~ msgstr "Glasovati"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Preveli %s."
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Pročitati&nbsp;rezultat"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Prevela %s."
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Slijediti&nbsp;prijedlog"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Prevele %s."
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ispraviti&nbsp;prijedlog"
-#~ msgid "List of Speakers"
-#~ msgstr "Popis govornika"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Predati&nbsp;prijedlog"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Natrag na stranicu <a href=\"./\">Debian govornici</a>."
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kako"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Kako bi dobili ove vijesti tjedno u svoj elektronski poštanski pretinac, "
-#~ "<a href=\"https://lists.debian.org/debian-news/\">pretplatite se na "
-#~ "debian-news mailing listu.</a>"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Početna&nbsp;stranica&nbsp;glasovanja"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Weekly News uređuje <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Other"
+#~ msgstr "Ostalo"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Weekly News uređuju <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Withdrawn"
+#~ msgstr "Povučeno"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Ovo izdanje Debian Weekly News je uredio <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Decided"
+#~ msgstr "Odlučeno"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Ovo izdanje Debian Weekly News su uredili <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Glasovanje&nbsp;otvoreno"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "U&nbsp;raspravi"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Download Jigdom"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Čeka&nbsp;na&nbsp;pokrovitelje"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Download HTTP-om/FTP-om"
+#~ msgid "Outcome"
+#~ msgstr "Rezultat"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Kupi CD-e ili DVD-e"
+#~ msgid "Forum"
+#~ msgstr "Forum"
-#~ msgid "Network Install"
-#~ msgstr "Mrežna instalacija"
+#~ msgid "Ballot"
+#~ msgstr "Glasački list"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Download"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Minimalna rasprava"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Razno"
+#~ msgid "Quorum"
+#~ msgstr "Kvorum"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Artwork"
+#~ msgid "Data and Statistics"
+#~ msgstr "Podaci i statistike"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Mirroranje"
+#~ msgid "Majority Requirement"
+#~ msgstr "Zahtjevi za većinu"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync mirrori"
+#~ msgid "Proceedings"
+#~ msgstr "Postupak"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Download Torrentom"
+#~ msgid "Amendments"
+#~ msgstr "Amandmani"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Informacije o izdanju snimki"
+#~ msgid "Amendment Text B"
+#~ msgstr "Tekst amandmana B"
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD grupa"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Amandman B podržavaju"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_na_cdu"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Amandman B predlaže"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "Amendment Text A"
+#~ msgstr "Tekst amandmana A"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Amandman A podržavaju"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Amandman A predlaže"
-#~ msgid "buy"
-#~ msgstr "kupi"
+#~ msgid "Amendment Text"
+#~ msgstr "Tekst amandmana"
-#~ msgid "net_install"
-#~ msgstr "mrežni_instal"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Amandman podržavaju"
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "razno"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Predlagač amandmana"
-#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
-#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">Javna mailing lista</a> na engleskom "
-#~ "jeziku za CD-e/DVD-e:"
+#~ msgid "Choices"
+#~ msgstr "Izbor"
-#~ msgid "Date"
-#~ msgstr "Datum"
+#~ msgid "Proposal F"
+#~ msgstr "Prijedlog F"
-#~ msgid "Time Line"
-#~ msgstr "Vremenski tok"
+#~ msgid "Proposal E"
+#~ msgstr "Prijedlog E"
-#~ msgid "Nominations"
-#~ msgstr "Nominacije"
+#~ msgid "Proposal D"
+#~ msgstr "Prijedlog D"
-#~ msgid "Debate"
-#~ msgstr "Rasprava"
+#~ msgid "Proposal C"
+#~ msgstr "Prijedlog C"
-#~ msgid "Platforms"
-#~ msgstr "Platforme"
+#~ msgid "Proposal B"
+#~ msgstr "Prijedlog B"
-#~ msgid "Proposer"
-#~ msgstr "Predlagač"
+#~ msgid "Proposal A"
+#~ msgstr "Prijedlog A"
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Predlagač prijedloga A"
+#~ msgid "Text"
+#~ msgstr "Tekst"
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Predlagač prijedloga B"
+#~ msgid "Opposition"
+#~ msgstr "Protivljenje"
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Predlagač prijedloga C"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Prijedlog F podržavaju"
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Predlagač prijedloga D"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Prijedlog E podržavaju"
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Predlagač prijedloga E"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Prijedlog D podržavaju"
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Predlagač prijedloga F"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Prijedlog C podržavaju"
-#~ msgid "Seconds"
-#~ msgstr "Podržavaju"
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Prijedlog B podržavaju"
#~ msgid "Proposal A Seconds"
#~ msgstr "Prijedlog A podržavaju"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Prijedlog B podržavaju"
+#~ msgid "Seconds"
+#~ msgstr "Podržavaju"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Prijedlog C podržavaju"
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Predlagač prijedloga F"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Prijedlog D podržavaju"
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Predlagač prijedloga E"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Prijedlog E podržavaju"
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Predlagač prijedloga D"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Prijedlog F podržavaju"
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Predlagač prijedloga C"
-#~ msgid "Opposition"
-#~ msgstr "Protivljenje"
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Predlagač prijedloga B"
-#~ msgid "Text"
-#~ msgstr "Tekst"
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Predlagač prijedloga A"
-#~ msgid "Proposal A"
-#~ msgstr "Prijedlog A"
+#~ msgid "Proposer"
+#~ msgstr "Predlagač"
-#~ msgid "Proposal B"
-#~ msgstr "Prijedlog B"
+#~ msgid "Platforms"
+#~ msgstr "Platforme"
-#~ msgid "Proposal C"
-#~ msgstr "Prijedlog C"
+#~ msgid "Debate"
+#~ msgstr "Rasprava"
-#~ msgid "Proposal D"
-#~ msgstr "Prijedlog D"
+#~ msgid "Nominations"
+#~ msgstr "Nominacije"
-#~ msgid "Proposal E"
-#~ msgstr "Prijedlog E"
+#~ msgid "Time Line"
+#~ msgstr "Vremenski tok"
-#~ msgid "Proposal F"
-#~ msgstr "Prijedlog F"
+#~ msgid "Date"
+#~ msgstr "Datum"
-#~ msgid "Choices"
-#~ msgstr "Izbor"
+#~ msgid ""
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
+#~ msgstr ""
+#~ "<a href=\"/MailingLists/disclaimer\">Javna mailing lista</a> na engleskom "
+#~ "jeziku za CD-e/DVD-e:"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Predlagač amandmana"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "razno"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Amandman podržavaju"
+#~ msgid "net_install"
+#~ msgstr "mrežni_instal"
-#~ msgid "Amendment Text"
-#~ msgstr "Tekst amandmana"
+#~ msgid "buy"
+#~ msgstr "kupi"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Amandman A predlaže"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Amandman A podržavaju"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "Amendment Text A"
-#~ msgstr "Tekst amandmana A"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Amandman B predlaže"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_na_cdu"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Amandman B podržavaju"
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD grupa"
-#~ msgid "Amendment Text B"
-#~ msgstr "Tekst amandmana B"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Informacije o izdanju snimki"
-#~ msgid "Amendments"
-#~ msgstr "Amandmani"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Download Torrentom"
-#~ msgid "Proceedings"
-#~ msgstr "Postupak"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync mirrori"
-#~ msgid "Majority Requirement"
-#~ msgstr "Zahtjevi za većinu"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Mirroranje"
-#~ msgid "Data and Statistics"
-#~ msgstr "Podaci i statistike"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Artwork"
-#~ msgid "Quorum"
-#~ msgstr "Kvorum"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Razno"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Minimalna rasprava"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Download"
-#~ msgid "Ballot"
-#~ msgstr "Glasački list"
+#~ msgid "Network Install"
+#~ msgstr "Mrežna instalacija"
-#~ msgid "Forum"
-#~ msgstr "Forum"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Kupi CD-e ili DVD-e"
-#~ msgid "Outcome"
-#~ msgstr "Rezultat"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Download HTTP-om/FTP-om"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Čeka&nbsp;na&nbsp;pokrovitelje"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Download Jigdom"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "U&nbsp;raspravi"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Glasovanje&nbsp;otvoreno"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Ovo izdanje Debian Weekly News su uredili <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Decided"
-#~ msgstr "Odlučeno"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Ovo izdanje Debian Weekly News je uredio <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Withdrawn"
-#~ msgstr "Povučeno"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Weekly News uređuju <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Other"
-#~ msgstr "Ostalo"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Weekly News uređuje <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Početna&nbsp;stranica&nbsp;glasovanja"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Kako bi dobili ove vijesti tjedno u svoj elektronski poštanski pretinac, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">pretplatite se na "
+#~ "debian-news mailing listu.</a>"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kako"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Natrag na stranicu <a href=\"./\">Debian govornici</a>."
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Predati&nbsp;prijedlog"
+#~ msgid "List of Speakers"
+#~ msgstr "Popis govornika"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ispraviti&nbsp;prijedlog"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Prevele %s."
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Slijediti&nbsp;prijedlog"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Prevela %s."
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Pročitati&nbsp;rezultat"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Preveli %s."
-#~ msgid "Vote"
-#~ msgstr "Glasovati"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Preveo %s."
#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Pogledajte stranicu <a href=\"./\">informacije o licencama</a> za pregled "
-#~ "Debian License Summaries (DLS)."
-
-#~ msgid "Not Redistributable"
-#~ msgstr "Ne može se redistribuirati"
-
-#~ msgid "Non-Free"
-#~ msgstr "Neslobodan"
-
-#~ msgid "Free"
-#~ msgstr "Slobodan"
+#~ "<void id=\"plural\" />Ovo izdanje Debian Project News su uredili <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "not redistributable"
-#~ msgstr "ne može se redistribuirati"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Ovo izdanje Debian Project News je uredio <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "non-free"
-#~ msgstr "neslobodan"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Project News uređuju <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "free"
-#~ msgstr "slobodan"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Project News uređuje <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "License text"
-#~ msgstr "Tekst licence"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "<a href=\"../../\">Prijašnja izdanja</a> ovih vijesti su dostupna."
-#~ msgid "License text (translated)"
-#~ msgstr "Tekst licence (preveden)"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Kako bi dobili ove vijesti svako dva tjedna u svoj elektronski poštanski "
+#~ "pretinac, <a href=\"https://lists.debian.org/debian-news/\">pretplatite "
+#~ "se na debian-news mailing listu.</a>"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Ovaj sažetak je pripremio <summary-author/>."
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (mrtav link)"
#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr ""
-#~ "Originalni sažetak kojeg je napisao <summary-author/> može se naći u <a "
-#~ "href=\"<summary-url/>\">arhivama mailing lista</a>."
+#~ "Povratak na: druge <a href=\"./\">vijesti o Debianu</a> || <a href="
+#~ "\"m4_HOME/\">početnu stranicu Debian projekta</a>."
-#~ msgid "Original Summary"
-#~ msgstr "Originalni sažetak"
+#~ msgid "Download calendar entry"
+#~ msgstr "Prijenos unosa u kalendar"
-#~ msgid "Discussion"
-#~ msgstr "Rasprava"
+#~ msgid "Latest News"
+#~ msgstr "Najnovije vijesti"
-#~ msgid "Justification"
-#~ msgstr "Opravdanje"
+#~ msgid "Related Links"
+#~ msgstr "Srodne veze"
-#~ msgid "Summary"
-#~ msgstr "Sažetak"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
-#~ msgid "Version"
-#~ msgstr "Inačica"
+#~ msgid "Main Coordinator"
+#~ msgstr "Glavni koordinator"
-#~ msgid "License"
-#~ msgstr "Licenca"
+#~ msgid "Debian Involvement"
+#~ msgstr "Upletenost Debiana"
-#~ msgid "Date published"
-#~ msgstr "Datum objave"
+#~ msgid "More Info"
+#~ msgstr "Podrobnije informacije"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, inačica %s: %s"
+#~ msgid "Where"
+#~ msgstr "Gdje"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "When"
+#~ msgstr "Kada"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal arhiva"
+#~ msgid "link may no longer be valid"
+#~ msgstr "veza možda više ne radi"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Nadolazeće atrakcije"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "More information"
+#~ msgstr "Podrobnije informacije"
-#~ msgid "DLS Index"
-#~ msgstr "DLS indeks"
+#~ msgid "Rating:"
+#~ msgstr "Ocjena:"
-#~ msgid "License Information"
-#~ msgstr "Informacije o licenci"
+#~ msgid "Nobody"
+#~ msgstr "Nitko"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Natrag na stranicu <a href=\"./\">Debian konzultanti</a>."
+#~ msgid "Taken by:"
+#~ msgstr "Zauzeo:"
-#~ msgid "List of Consultants"
-#~ msgstr "Popis konzultanata"
+#~ msgid "More information:"
+#~ msgstr "Više informacija:"
+
+#~ msgid "Select a server near you"
+#~ msgstr "Izaberite vama blizak poslužitelj"
+
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Posjetite pokrovitelja stranica"
diff --git a/croatian/po/vendors.hr.po b/croatian/po/vendors.hr.po
index 8ff78754906..60ae808f1b4 100644
--- a/croatian/po/vendors.hr.po
+++ b/croatian/po/vendors.hr.po
@@ -65,74 +65,74 @@ msgstr "izvorni kod"
msgid "and"
msgstr "i"
-#~ msgid "Vendor:"
-#~ msgstr "Distributer:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL za Debian stranicu:"
+#~ msgid "Official CD"
+#~ msgstr "Službeni CD"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Omogućava donaciju Debianu:"
+#~ msgid "Official DVD"
+#~ msgstr "Službeni DVD"
-#~ msgid "Country:"
-#~ msgstr "Zemlja:"
+#~ msgid "Development Snapshot"
+#~ msgstr "Razvojni snimak"
-#~ msgid "Ship International:"
-#~ msgstr "Isporučuje međunarodno:"
+#~ msgid "Vendor Release"
+#~ msgstr "Distributerovo izdanje"
-#~ msgid "email:"
-#~ msgstr "e-mail:"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Višestruka distribucija"
-#~ msgid "CD Type:"
-#~ msgstr "Vrsta CD-a:"
+#~ msgid "non-US included"
+#~ msgstr "non-US uključen"
-#~ msgid "DVD Type:"
-#~ msgstr "Vrsta DVD-a:"
+#~ msgid "non-free included"
+#~ msgstr "non-free uključen"
-#~ msgid "Architectures:"
-#~ msgstr "Arhitekture:"
+#~ msgid "contrib included"
+#~ msgstr "contrib uključen"
-#~ msgid "updated monthly"
-#~ msgstr "osvježava se mjesečno"
+#~ msgid "vendor additions"
+#~ msgstr "dodaci tvrtke"
-#~ msgid "updated twice weekly"
-#~ msgstr "osvježava se dvaput tjedno"
+#~ msgid "Custom Release"
+#~ msgstr "Vlastito izdanje"
-#~ msgid "updated weekly"
-#~ msgstr "osvježava se tjedno"
+#~ msgid "reseller of $var"
+#~ msgstr "preprodaje $var"
#~ msgid "reseller"
#~ msgstr "preprodaje"
-#~ msgid "reseller of $var"
-#~ msgstr "preprodaje $var"
+#~ msgid "updated weekly"
+#~ msgstr "osvježava se tjedno"
-#~ msgid "Custom Release"
-#~ msgstr "Vlastito izdanje"
+#~ msgid "updated twice weekly"
+#~ msgstr "osvježava se dvaput tjedno"
-#~ msgid "vendor additions"
-#~ msgstr "dodaci tvrtke"
+#~ msgid "updated monthly"
+#~ msgstr "osvježava se mjesečno"
-#~ msgid "contrib included"
-#~ msgstr "contrib uključen"
+#~ msgid "Architectures:"
+#~ msgstr "Arhitekture:"
-#~ msgid "non-free included"
-#~ msgstr "non-free uključen"
+#~ msgid "DVD Type:"
+#~ msgstr "Vrsta DVD-a:"
-#~ msgid "non-US included"
-#~ msgstr "non-US uključen"
+#~ msgid "CD Type:"
+#~ msgstr "Vrsta CD-a:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Višestruka distribucija"
+#~ msgid "email:"
+#~ msgstr "e-mail:"
-#~ msgid "Vendor Release"
-#~ msgstr "Distributerovo izdanje"
+#~ msgid "Ship International:"
+#~ msgstr "Isporučuje međunarodno:"
-#~ msgid "Development Snapshot"
-#~ msgstr "Razvojni snimak"
+#~ msgid "Country:"
+#~ msgstr "Zemlja:"
-#~ msgid "Official DVD"
-#~ msgstr "Službeni DVD"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Omogućava donaciju Debianu:"
-#~ msgid "Official CD"
-#~ msgstr "Službeni CD"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL za Debian stranicu:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Distributer:"
diff --git a/czech/po/blends.cs.po b/czech/po/blends.cs.po
index 64b8c15bf29..b00934651af 100644
--- a/czech/po/blends.cs.po
+++ b/czech/po/blends.cs.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/czech/po/bugs.cs.po b/czech/po/bugs.cs.po
index 98a51d6ada0..0fd19f264d5 100644
--- a/czech/po/bugs.cs.po
+++ b/czech/po/bugs.cs.po
@@ -155,146 +155,146 @@ msgstr "Archivované"
msgid "Archived and Unarchived"
msgstr "Archivované i nearchivované"
-#~ msgid "Flags:"
-#~ msgstr "Příznaky:"
-
-#~ msgid "active bugs"
-#~ msgstr "aktivní chyby"
+#~ msgid "Exclude tag:"
+#~ msgstr "Vynechat značku:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "zobrazit sloučené chyby pouze jednou"
+#~ msgid "Include tag:"
+#~ msgstr "Zahrnout značku:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "netřídit podle stavu nebo závažnosti"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "v záhlaví nezobrazovat obsah"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "v patičce nezobrazovat statistiku"
+#~ msgid "wontfix"
+#~ msgstr "nebudu opravovat"
-#~ msgid "proposed-updates"
-#~ msgstr "navrhované aktualizace"
+#~ msgid "upstream"
+#~ msgstr "původní autor"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "navrhované testovací aktualizace"
+#~ msgid "unreproducible"
+#~ msgstr "nereprodukovatelné"
-#~ msgid "Package version:"
-#~ msgstr "Verze balíčku:"
+#~ msgid "security"
+#~ msgstr "bezpečnost"
-#~ msgid "Distribution:"
-#~ msgstr "Distribuce:"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "bugs"
-#~ msgstr "chyby"
+#~ msgid "moreinfo"
+#~ msgstr "více informací"
-#~ msgid "open"
-#~ msgstr "otevřený"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "forwarded"
-#~ msgstr "přeposlaný"
+#~ msgid "help"
+#~ msgstr "pomoc"
-#~ msgid "pending"
-#~ msgstr "čekající"
+#~ msgid "fixed-upstream"
+#~ msgstr "opraveno u autora"
-#~ msgid "fixed"
-#~ msgstr "opravený"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "opraveno v experimental"
-#~ msgid "done"
-#~ msgstr "vyřešený"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "Zahrnout stav:"
+#~ msgid "confirmed"
+#~ msgstr "potvrzeno"
-#~ msgid "Exclude status:"
-#~ msgstr "Vynechat stav:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "kritický"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "grave"
-#~ msgstr "závažný"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "serious"
-#~ msgstr "vážný"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "důležitý"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "minor"
-#~ msgstr "podružný"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "wishlist"
-#~ msgstr "přání"
+#~ msgid "Exclude severity:"
+#~ msgstr "Vynechat závažnost:"
#~ msgid "Include severity:"
#~ msgstr "Zahrnout závažnost:"
-#~ msgid "Exclude severity:"
-#~ msgstr "Vynechat závažnost:"
+#~ msgid "wishlist"
+#~ msgstr "přání"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "podružný"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "důležitý"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "vážný"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "závažný"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "kritický"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Vynechat stav:"
-#~ msgid "confirmed"
-#~ msgstr "potvrzeno"
+#~ msgid "Include status:"
+#~ msgstr "Zahrnout stav:"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "vyřešený"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "opraveno v experimental"
+#~ msgid "fixed"
+#~ msgstr "opravený"
-#~ msgid "fixed-upstream"
-#~ msgstr "opraveno u autora"
+#~ msgid "pending"
+#~ msgstr "čekající"
-#~ msgid "help"
-#~ msgstr "pomoc"
+#~ msgid "forwarded"
+#~ msgstr "přeposlaný"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "open"
+#~ msgstr "otevřený"
-#~ msgid "moreinfo"
-#~ msgstr "více informací"
+#~ msgid "bugs"
+#~ msgstr "chyby"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "Distribution:"
+#~ msgstr "Distribuce:"
-#~ msgid "security"
-#~ msgstr "bezpečnost"
+#~ msgid "Package version:"
+#~ msgstr "Verze balíčku:"
-#~ msgid "unreproducible"
-#~ msgstr "nereprodukovatelné"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "navrhované testovací aktualizace"
-#~ msgid "upstream"
-#~ msgstr "původní autor"
+#~ msgid "proposed-updates"
+#~ msgstr "navrhované aktualizace"
-#~ msgid "wontfix"
-#~ msgstr "nebudu opravovat"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "v patičce nezobrazovat statistiku"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "v záhlaví nezobrazovat obsah"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "netřídit podle stavu nebo závažnosti"
-#~ msgid "Include tag:"
-#~ msgstr "Zahrnout značku:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "zobrazit sloučené chyby pouze jednou"
-#~ msgid "Exclude tag:"
-#~ msgstr "Vynechat značku:"
+#~ msgid "active bugs"
+#~ msgstr "aktivní chyby"
+
+#~ msgid "Flags:"
+#~ msgstr "Příznaky:"
diff --git a/czech/po/distrib.cs.po b/czech/po/distrib.cs.po
index 4d7105b2ef3..e4c27442e32 100644
--- a/czech/po/distrib.cs.po
+++ b/czech/po/distrib.cs.po
@@ -213,8 +213,8 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
-
#~ msgid "AMD64"
#~ msgstr "AMD64"
+
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/czech/po/doc.cs.po b/czech/po/doc.cs.po
index 819cd30ead5..203fa7a4575 100644
--- a/czech/po/doc.cs.po
+++ b/czech/po/doc.cs.po
@@ -30,8 +30,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -55,31 +55,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -91,7 +67,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -103,7 +79,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -111,6 +87,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autor:"
@@ -163,10 +155,10 @@ msgstr "(verze <get-var version />)"
msgid "plain text"
msgstr "prostý text"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -191,12 +183,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -229,12 +215,12 @@ msgstr ""
msgid "PDF"
msgstr ""
+#~ msgid "Language:"
+#~ msgstr "Jazyk:"
+
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "Stáhnout zdrojový SGML text <get-var ddp_pkg_loc /> pomocí <a href=\"cvs"
#~ "\">SVN</a>."
-
-#~ msgid "Language:"
-#~ msgstr "Jazyk:"
diff --git a/czech/po/organization.cs.po b/czech/po/organization.cs.po
index 6e41a096854..56f4c10a3f6 100644
--- a/czech/po/organization.cs.po
+++ b/czech/po/organization.cs.po
@@ -71,22 +71,22 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr ""
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr ""
@@ -103,270 +103,278 @@ msgstr ""
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr ""
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr ""
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr ""
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr ""
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
"contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+msgid "Salsa administrators"
+msgstr ""
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
+
+#: ../../english/intro/organization.data:492
+msgid "Debian for astronomy"
+msgstr ""
diff --git a/czech/po/partners.cs.po b/czech/po/partners.cs.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/czech/po/partners.cs.po
+++ b/czech/po/partners.cs.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/czech/po/stats.cs.po b/czech/po/stats.cs.po
index 129f7ba91dd..008d1ba15b9 100644
--- a/czech/po/stats.cs.po
+++ b/czech/po/stats.cs.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/czech/po/templates.cs.po b/czech/po/templates.cs.po
index 7aa10936594..64cc3425ec4 100644
--- a/czech/po/templates.cs.po
+++ b/czech/po/templates.cs.po
@@ -207,11 +207,11 @@ msgstr "ve vydání 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Problémy týkající se webových stránek oznamujte anglicky na e-mail <a href="
"\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. "
@@ -511,6 +511,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Poznámka:</em> Původní dokument tohoto překladu již neexistuje."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -519,20 +523,20 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Zpět na stránku <a href=\"../\">Kdo používá Debian?</a>."
-#~ msgid "Rating:"
-#~ msgstr "Hodnocení:"
-
-#~ msgid "Nobody"
-#~ msgstr "Nikdo"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Navštivte sponzora stránek"
-#~ msgid "Taken by:"
-#~ msgstr "Převzal:"
+#~ msgid "Select a server near you"
+#~ msgstr "Zvolte si nejbližší server"
#~ msgid "More information:"
#~ msgstr "Více informací:"
-#~ msgid "Select a server near you"
-#~ msgstr "Zvolte si nejbližší server"
+#~ msgid "Taken by:"
+#~ msgstr "Převzal:"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Navštivte sponzora stránek"
+#~ msgid "Nobody"
+#~ msgstr "Nikdo"
+
+#~ msgid "Rating:"
+#~ msgstr "Hodnocení:"
diff --git a/danish/po/blends.da.po b/danish/po/blends.da.po
index 29f1b173e43..d063984b2ff 100644
--- a/danish/po/blends.da.po
+++ b/danish/po/blends.da.po
@@ -17,13 +17,25 @@ msgstr "Derivativer"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Formålet med Debian Astro er at udvikle et Debian-baseret styresystem, som "
+"opfylder både professionelles og hobbyastronomers behov. Det integrerer et "
+"store antal softwarepakker, dækkende teleskopkontrol, datareduktion, "
+"præsentation og andre områder."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"Formålet med DebiChem er at gøre Debian til en god platform for kemikere i "
"deres daglige arbejde."
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
@@ -31,7 +43,7 @@ msgstr ""
"Formålet med Debian Games er at levere spil via Debian, fra arcade og "
"eventyr til simulering og strategi."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -39,7 +51,7 @@ msgstr ""
"Formålet med Debian Edu er at levere et Debian-baseret styresystem som er "
"velegnet til undervisningsbrug og i skoler."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -47,7 +59,7 @@ msgstr ""
"Formålet med Debian GIS er at udvikle Debian til at være den bedste "
"distribution for Geographical Information System-applikationer og -brugere."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -55,7 +67,7 @@ msgstr ""
"Formålet med Debian Junior er at gøre Debian til et styresystem som børn kan "
"have fornøjelse af at bruge."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -68,7 +80,7 @@ msgstr ""
"billedbehandling, bioinformatik, klinisk it-infrastruktur samt andet i "
"Debians styresystem."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -76,7 +88,7 @@ msgstr ""
"Formålet med Debian Multimedia er at gøre Debian til en god platform til "
"lyd- og multimediearbejde."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -95,25 +107,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Formålet med Debian Astro er at udvikle et Debian-baseret styresystem, som "
-"opfylder både professionelles og hobbyastronomers behov. Det integrerer et "
-"store antal softwarepakker, dækkende teleskopkontrol, datareduktion, "
-"præsentation og andre områder."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Formålet med Debian Design er at stille applikationer til rådighed for "
"designere. Herunder grafisk design, webdesign og multimediedesign."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -128,7 +128,7 @@ msgstr ""
"mange områder og regioner, som fx Afrika, Afghanistan, Indonesien, Vietnam, "
"med brug af Debian."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -142,7 +142,7 @@ msgstr ""
"mail, webproxy og et Tor-relay, på en enhed, der kan erstatte en trådløs "
"router, således at dataene forbliver hos brugerne."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -151,7 +151,7 @@ msgstr ""
"Debian, ved at stille applikationer til rådighed for logning, data- og "
"pakketilstand mv."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -160,8 +160,8 @@ msgstr ""
"opfylder parlamentarikeres, politikeres og deres stabes behov rundt omkring "
"i verden."
-#~ msgid "Debian Accessibility"
-#~ msgstr "Debian Accessibility"
-
#~ msgid "Debian Games"
#~ msgstr "Debian Games"
+
+#~ msgid "Debian Accessibility"
+#~ msgstr "Debian Accessibility"
diff --git a/danish/po/bugs.da.po b/danish/po/bugs.da.po
index a4a2a9666ef..ea0be5dbe5c 100644
--- a/danish/po/bugs.da.po
+++ b/danish/po/bugs.da.po
@@ -155,152 +155,152 @@ msgstr "Arkiveret"
msgid "Archived and Unarchived"
msgstr "Arkiveret og uarkiveret"
-#~ msgid "Flags:"
-#~ msgstr "Flag:"
-
-#~ msgid "active bugs"
-#~ msgstr "aktive fejl"
+#~ msgid "Exclude tag:"
+#~ msgstr "Mærke indeholder ikke: "
-#~ msgid "display merged bugs only once"
-#~ msgstr "vis kun flettede fejl én gang"
+#~ msgid "Include tag:"
+#~ msgstr "Mærke indeholder: "
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/alvorlighedsgrad"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "vis ikke indholdsfortegnelse øverst"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "vis ikke statistik i bunden"
+#~ msgid "wontfix"
+#~ msgstr "vil ikke rette"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "opstrøm"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "ikke reproducérbar"
-#~ msgid "Package version:"
-#~ msgstr "Pakkeversion:"
+#~ msgid "security"
+#~ msgstr "sikkerhed"
-#~ msgid "Distribution:"
-#~ msgstr "Distribution:"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "bugs"
-#~ msgstr "fejl"
+#~ msgid "moreinfo"
+#~ msgstr "mere info"
-#~ msgid "open"
-#~ msgstr "åben"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "forwarded"
-#~ msgstr "videresendt"
+#~ msgid "help"
+#~ msgstr "hjælp"
-#~ msgid "pending"
-#~ msgstr "i gang"
+#~ msgid "fixed-upstream"
+#~ msgstr "rettet-opstrøm"
-#~ msgid "fixed"
-#~ msgstr "rettet"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "rettet-i-eksperimentel"
-#~ msgid "done"
-#~ msgstr "færdig"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "Status indeholder: "
+#~ msgid "confirmed"
+#~ msgstr "bekræftet"
-#~ msgid "Exclude status:"
-#~ msgstr "Status indeholder ikke: "
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "kritisk"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignorer"
-#~ msgid "grave"
-#~ msgstr "graverende"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "alvorlig"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignorer"
-#~ msgid "important"
-#~ msgstr "vigtig"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "minor"
-#~ msgstr "mindre"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignorer"
-#~ msgid "wishlist"
-#~ msgstr "ønskeliste"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Alvorlighedsgrad indeholder: "
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Alvorlighedsgrad indeholder ikke: "
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Alvorlighedsgrad indeholder: "
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "ønskeliste"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignorer"
+#~ msgid "minor"
+#~ msgstr "mindre"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "vigtig"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignorer"
+#~ msgid "serious"
+#~ msgstr "alvorlig"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "graverende"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignorer"
+#~ msgid "critical"
+#~ msgstr "kritisk"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Status indeholder ikke: "
-#~ msgid "confirmed"
-#~ msgstr "bekræftet"
+#~ msgid "Include status:"
+#~ msgstr "Status indeholder: "
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "færdig"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "rettet-i-eksperimentel"
+#~ msgid "fixed"
+#~ msgstr "rettet"
-#~ msgid "fixed-upstream"
-#~ msgstr "rettet-opstrøm"
+#~ msgid "pending"
+#~ msgstr "i gang"
-#~ msgid "help"
-#~ msgstr "hjælp"
+#~ msgid "forwarded"
+#~ msgstr "videresendt"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "open"
+#~ msgstr "åben"
-#~ msgid "moreinfo"
-#~ msgstr "mere info"
+#~ msgid "bugs"
+#~ msgstr "fejl"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "Distribution:"
+#~ msgstr "Distribution:"
-#~ msgid "security"
-#~ msgstr "sikkerhed"
+#~ msgid "Package version:"
+#~ msgstr "Pakkeversion:"
-#~ msgid "unreproducible"
-#~ msgstr "ikke reproducérbar"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "opstrøm"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "vil ikke rette"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "vis ikke statistik i bunden"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "vis ikke indholdsfortegnelse øverst"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/alvorlighedsgrad"
-#~ msgid "Include tag:"
-#~ msgstr "Mærke indeholder: "
+#~ msgid "display merged bugs only once"
+#~ msgstr "vis kun flettede fejl én gang"
-#~ msgid "Exclude tag:"
-#~ msgstr "Mærke indeholder ikke: "
+#~ msgid "active bugs"
+#~ msgstr "aktive fejl"
+
+#~ msgid "Flags:"
+#~ msgstr "Flag:"
diff --git a/danish/po/countries.da.po b/danish/po/countries.da.po
index 48ef3bb33ac..ad50ad438fa 100644
--- a/danish/po/countries.da.po
+++ b/danish/po/countries.da.po
@@ -425,8 +425,8 @@ msgstr "Sydafrika"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoslavien"
-
#~ msgid "Great Britain"
#~ msgstr "Storbritannien"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavien"
diff --git a/danish/po/distrib.da.po b/danish/po/distrib.da.po
index 649811ba7fc..9bcb6f320f0 100644
--- a/danish/po/distrib.da.po
+++ b/danish/po/distrib.da.po
@@ -200,53 +200,53 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "pakker der indeholder filer eller mapper med navne som dette"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "all files in this package"
-#~ msgstr "alle filer i denne pakke"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Case sensitive"
-#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "no"
-#~ msgstr "nej"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "yes"
-#~ msgstr "ja"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Tillad søgning på dele af ord"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Search case sensitive"
-#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
#~ msgid "MIPS (DEC)"
#~ msgstr "MIPS (DEC)"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Search case sensitive"
+#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Tillad søgning på dele af ord"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "ja"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "nej"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "alle filer i denne pakke"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "pakker der indeholder filer eller mapper med navne som dette"
diff --git a/danish/po/doc.da.po b/danish/po/doc.da.po
index e6bad25d33f..82e8a983f3c 100644
--- a/danish/po/doc.da.po
+++ b/danish/po/doc.da.po
@@ -211,13 +211,13 @@ msgstr "(version <get-var version />)"
msgid "plain text"
msgstr "ren tekst"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a>-arkivet."
+"\"https://packages.debian.org/git\">Git</a>-arkivet."
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
@@ -245,14 +245,6 @@ 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:178
-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:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -283,226 +275,117 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 til ARM-arkitekturen"
-
-#~ msgid ""
-#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
-#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
-#~ "Psion5).\n"
-#~ " It also gives generic information, tools and techniques. The GNU\n"
-#~ " toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ " includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ " coming from other platforms.\n"
-#~ " It is not specific to Debian, but the Aleph\n"
-#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ " will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ " host machine too."
-#~ msgstr ""
-#~ "Denne bog er rettet med udviklere, der kører GNU/Linux på en ARM-"
-#~ "processor.\n"
-#~ " Visse enheder dækkes specifikt af hensyn til hurtig opsætning (LART, \n"
-#~ " Assabet, Psion5). Den giver også generelle oplysninger, værktøjer og\n"
-#~ " teknikker. GNU's toolchain er dækket i <q>native</q>- og <q>cross-"
-#~ "compiler</q>-form,\n"
-#~ " det samme gælder bootloaders, kernerettelser, RAM-diske, ARM-særheder "
-#~ "og\n"
-#~ " andre ARM-ressourcer. Den indeholder også udførlig indføring i basal "
-#~ "viden\n"
-#~ " om GNU/Linux for udviklere, der kommer fra andre platforme. Den er "
-#~ "ikke\n"
-#~ " Debian-specifik, men Aleph ARMLinux-distributionen er baseret nøje på\n"
-#~ " Debian-ARM og det forudsættes at man vil arbejde fra denne distribution "
-#~ "og\n"
-#~ " helst også har en Debian-baseret værtsmaskine."
-
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "En alternativ <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " udgivelse</a> er tilgængelig fra Lehmanns Fachbuchhandlung og koster\n"
-#~ " 29,95 € (pr. 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Brug <a href=\"cvs\">SVN</a> til at hente SGML-kildekodeteksten til <get-"
-#~ "var ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Sprog:"
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "Sarge-cd med installeringsprogram og et udvalg af pakker"
-#~ msgid "Latest version in development:"
-#~ msgstr "Seneste udviklingsversion:"
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live-cd med Knoppix"
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Dette er den rigtige bog til dig, der vil lære hvordan man etablerer "
-#~ "grundlæggende og komplekse it-platforme udelukkende ved hjælp af fri "
-#~ "software. I bogen er der et bredt spektrum af procedurer, gennemgået og "
-#~ "justeret til at passe til bedste praksis ved implementering af "
-#~ "teknologiske infrastrukturer. Denne letlæste og udtømmende guide tager "
-#~ "dig i hånden med opfyldelse af specifikke mål med styresystemet Debian "
-#~ "GNU/Linux."
+#~ "Både begyndere og avancerede brugere kan bruge denne bog som en "
+#~ "udtømmende\n"
+#~ " kilde til oplysninger om anvendelse af Debian på desktop-maskiner, i\n"
+#~ " intranet og på internet-servere, samt til udvikling. Den indeholder "
+#~ "også\n"
+#~ " en omfattede dækning af Debians unikke pakkehåndteringssystem."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Denne bog er opdelt i fire dele: grundlæggende koncepter, håndtering af "
-#~ "GNU/\n"
-#~ "Linux, administrering af systemet og avancerede handlinger. Hvert "
-#~ "kapitel\n"
-#~ "forklarer uddybende om styresystemets funktioner. De første kapitler\n"
-#~ "fortæller om GNU/Linux' struktur. Disse kapitler hjælper læseren med at\n"
-#~ "forstå hvordan systemet anvender grundlæggende ressourcer som "
-#~ "processoren\n"
-#~ "og hukommelsen. En detaljeret analyse af filsystemer, så som Ext2, Ext3\n"
-#~ "og ReiserFS gør det muligt for brugeren at foretage det rigtige valg til\n"
-#~ "deres behov. Mange illustrationen gennem bogen viser aspekter ved\n"
-#~ "systemets ydelse. Bogen er rettet med univeritetsstuderende og alle der\n"
-#~ "ønsker at lære GNU/Linux til bunds. Bogen dækker Debian sarge."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "officiel Debian GNU/Linux 3.1r0a sarge på dvd (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Den første persiske bog om Debian GNU/Linux. Bogen hjælper læseren med "
-#~ "at\n"
-#~ "installere Debian GNU/Linux samt opsætte netværkstjenester som web,\n"
-#~ "database, firewall, mail, ftp osv. på systemet. Man hjælpes også i gang\n"
-#~ "med at anvende GNU/Linux og Debians avancerede pakkehåndteringssystem."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 cd1"
+#~ "Denne bog introducerer koncepter og teknikker ved styresystemet Debian,\n"
+#~ " forklarer om anvendelse og faldgruber, desuden illustreres tankegange "
+#~ "bag\n"
+#~ " hver indgangsvinkel. Målet er ikke at være en opslagsbog, men at give\n"
+#~ " læseren tilstrækkeligt med indsigt i hvordan projektet og "
+#~ "styresystemet\n"
+#~ " fungerer, til at lære og tage de sofistikerede og elegante, nogle "
+#~ "gange\n"
+#~ " måske ikke-intuitive løsninger til sig, som er opstået som dele af "
+#~ "Debian-\n"
+#~ " systemet i løbet af det sidste årti. Selvom bogen er rettet mod\n"
+#~ " velbevandrede UNIX/Linux-administratorer, kan den også bruges som en\n"
+#~ " glimrende ressource sammen med en almindelig Linuxbog, til at komme i "
+#~ "gang\n"
+#~ " med ens Linux-erfaringer og Debians filosofi om at bygge nedefra og op."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Denne bog introducerer læserne til Debian GNU/Linux med mange øvelser og\n"
-#~ "tips. Bogen, der er skrevet på koreansk, dækker udførligt mange aspekter "
-#~ "af\n"
-#~ "Debian GNU/Linux-systemet: førstegangsopsætning, installering af pakker,\n"
-#~ "opsætning af X Windows, internetforbindelse, vedligeholdelse af\n"
-#~ "netværk, med mere. Bogen har en håndfuld tips til opsætning af Debian "
-#~ "GNU/\n"
-#~ "Linux-systemet i et koreansk sprogmiljø. Også god for Debian GNU/Linux-\n"
-#~ "begyndere."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Tre officielle potato r3-cd'er og en uofficiel woody-cd"
+#~ "En opslagsbog med eksempler vedrørende Debian GNU/Linux-systemet, der\n"
+#~ " med over 1500 <q>opskrifter</q> viser hvordan systemet anvendes ved\n"
+#~ " dagligdags aktiviteter - fra arbejde med tekst, billeder og lyd til\n"
+#~ " produktivitet og netværksproblemstillinger. Som den software bogen\n"
+#~ " beskriver, er bogen udgivet under en <q>copyleft</q>-licens og dens "
+#~ "kildedata\n"
+#~ " er tilgængelige."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Denne bog giver en kort vejledning i installering af Debian GNU/Linux,\n"
-#~ "fundamentale oplysninger om Unix- eller Linux-kommandoer, grundlæggende\n"
-#~ "opsætning og vedligeholdelse af systemet og netværket, opsætning af X\n"
-#~ "Window System samt anvendelse af multimedier i Debian GNU/Linux. Denne "
-#~ "bog\n"
-#~ "dækker også vedligeholdelsesoplysninger, som kan pirre koreanere til at\n"
-#~ "blive officielle Debian-vedligeholdere."
+#~ "<q>Learning Debian GNU/Linux</q> leder den nye Linux-bruger gennem "
+#~ "installering\n"
+#~ " og opsætning af Debian GNU/Linux. Windows-brugere får en nænsom "
+#~ "introduktion\n"
+#~ " til denne spændende computerverden."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "en uofficiel Woody, tre Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Denne bog dækker generelle emner om Debian GNU/Linux: Installering, APT "
-#~ "og\n"
-#~ " dpkg, shell, X Window System, netværk, systemadministration, opsætning "
-#~ "af\n"
-#~ " kernen, deling med Windows, opsætning af servere, osv. Ved hjælp af\n"
-#~ " tilpassede cd'er, vil man nemt kunne installere og begynde at bruge "
-#~ "Debian\n"
-#~ " GNU/Linux i et japansk miljø.GNU/Linux i et japansk miljø."
+#~ "Er på mere end 230 sider og indeholder tre cd-rom'er. Programmerne "
+#~ "dækker\n"
+#~ " blandt andre følgende områder: Debian Linux, netværk,\n"
+#~ " programmeringsværktøjer, grafisk brugerflade, dtp, virksomheder, sjove\n"
+#~ " ting samt multimedie. 30 dages gratis support via e-mail er inkluderet."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 forfatterens udgave (3 cd'er)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Dette er den seneste bog om \"sarge\" i den serie af bøger, som været\n"
-#~ "standardbiblen om Debian i Japan. Bogen dækker alle aspekter ved "
-#~ "anvendelse\n"
-#~ "af Debian GNU/Linux 3.1 \"sarge\", så som installering, desktopmiljøer,\n"
-#~ "systemadministration og serveropsætning. Desuden indeholder bogen også\n"
-#~ "en kommerciel skrifttypepakke. Bogen er nyttig for alle Debian-brugere,\n"
-#~ "fra begyndere til viderekomne."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "to udgaver: En uden cd og en med cd (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, forfatterens udgave (dvd+cd)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 og amd64) på dvd"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Denne bog er forfattet i ordbogsstil og indeholder forskellige tips til\n"
-#~ "begyndere og viderkommende brugere; installering på forskellige måder,\n"
-#~ "tilpasning af skrivebordsmiljøet, problemløsning, profitabel knowhow, osv."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge-installer (enkeltbredde-cd)"
+#~ "to udgaver: En uden cd og en med officiel cd (i386, contrib og kildekode)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -540,114 +423,230 @@ msgstr "PDF"
#~ "server\n"
#~ " til Windows-baserede klienter (SAMBA)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge-installer (enkeltbredde-cd)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "to udgaver: En uden cd og en med officiel cd (i386, contrib og kildekode)"
+#~ "Denne bog er forfattet i ordbogsstil og indeholder forskellige tips til\n"
+#~ "begyndere og viderkommende brugere; installering på forskellige måder,\n"
+#~ "tilpasning af skrivebordsmiljøet, problemløsning, profitabel knowhow, osv."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 og amd64) på dvd"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, forfatterens udgave (dvd+cd)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "to udgaver: En uden cd og en med cd (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Dette er den seneste bog om \"sarge\" i den serie af bøger, som været\n"
+#~ "standardbiblen om Debian i Japan. Bogen dækker alle aspekter ved "
+#~ "anvendelse\n"
+#~ "af Debian GNU/Linux 3.1 \"sarge\", så som installering, desktopmiljøer,\n"
+#~ "systemadministration og serveropsætning. Desuden indeholder bogen også\n"
+#~ "en kommerciel skrifttypepakke. Bogen er nyttig for alle Debian-brugere,\n"
+#~ "fra begyndere til viderekomne."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 forfatterens udgave (3 cd'er)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Er på mere end 230 sider og indeholder tre cd-rom'er. Programmerne "
-#~ "dækker\n"
-#~ " blandt andre følgende områder: Debian Linux, netværk,\n"
-#~ " programmeringsværktøjer, grafisk brugerflade, dtp, virksomheder, sjove\n"
-#~ " ting samt multimedie. 30 dages gratis support via e-mail er inkluderet."
+#~ "Denne bog dækker generelle emner om Debian GNU/Linux: Installering, APT "
+#~ "og\n"
+#~ " dpkg, shell, X Window System, netværk, systemadministration, opsætning "
+#~ "af\n"
+#~ " kernen, deling med Windows, opsætning af servere, osv. Ved hjælp af\n"
+#~ " tilpassede cd'er, vil man nemt kunne installere og begynde at bruge "
+#~ "Debian\n"
+#~ " GNU/Linux i et japansk miljø.GNU/Linux i et japansk miljø."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "en uofficiel Woody, tre Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "<q>Learning Debian GNU/Linux</q> leder den nye Linux-bruger gennem "
-#~ "installering\n"
-#~ " og opsætning af Debian GNU/Linux. Windows-brugere får en nænsom "
-#~ "introduktion\n"
-#~ " til denne spændende computerverden."
+#~ "Denne bog giver en kort vejledning i installering af Debian GNU/Linux,\n"
+#~ "fundamentale oplysninger om Unix- eller Linux-kommandoer, grundlæggende\n"
+#~ "opsætning og vedligeholdelse af systemet og netværket, opsætning af X\n"
+#~ "Window System samt anvendelse af multimedier i Debian GNU/Linux. Denne "
+#~ "bog\n"
+#~ "dækker også vedligeholdelsesoplysninger, som kan pirre koreanere til at\n"
+#~ "blive officielle Debian-vedligeholdere."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Tre officielle potato r3-cd'er og en uofficiel woody-cd"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "En opslagsbog med eksempler vedrørende Debian GNU/Linux-systemet, der\n"
-#~ " med over 1500 <q>opskrifter</q> viser hvordan systemet anvendes ved\n"
-#~ " dagligdags aktiviteter - fra arbejde med tekst, billeder og lyd til\n"
-#~ " produktivitet og netværksproblemstillinger. Som den software bogen\n"
-#~ " beskriver, er bogen udgivet under en <q>copyleft</q>-licens og dens "
-#~ "kildedata\n"
-#~ " er tilgængelige."
+#~ "Denne bog introducerer læserne til Debian GNU/Linux med mange øvelser og\n"
+#~ "tips. Bogen, der er skrevet på koreansk, dækker udførligt mange aspekter "
+#~ "af\n"
+#~ "Debian GNU/Linux-systemet: førstegangsopsætning, installering af pakker,\n"
+#~ "opsætning af X Windows, internetforbindelse, vedligeholdelse af\n"
+#~ "netværk, med mere. Bogen har en håndfuld tips til opsætning af Debian "
+#~ "GNU/\n"
+#~ "Linux-systemet i et koreansk sprogmiljø. Også god for Debian GNU/Linux-\n"
+#~ "begyndere."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 cd1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Denne bog introducerer koncepter og teknikker ved styresystemet Debian,\n"
-#~ " forklarer om anvendelse og faldgruber, desuden illustreres tankegange "
-#~ "bag\n"
-#~ " hver indgangsvinkel. Målet er ikke at være en opslagsbog, men at give\n"
-#~ " læseren tilstrækkeligt med indsigt i hvordan projektet og "
-#~ "styresystemet\n"
-#~ " fungerer, til at lære og tage de sofistikerede og elegante, nogle "
-#~ "gange\n"
-#~ " måske ikke-intuitive løsninger til sig, som er opstået som dele af "
-#~ "Debian-\n"
-#~ " systemet i løbet af det sidste årti. Selvom bogen er rettet mod\n"
-#~ " velbevandrede UNIX/Linux-administratorer, kan den også bruges som en\n"
-#~ " glimrende ressource sammen med en almindelig Linuxbog, til at komme i "
-#~ "gang\n"
-#~ " med ens Linux-erfaringer og Debians filosofi om at bygge nedefra og op."
+#~ "Den første persiske bog om Debian GNU/Linux. Bogen hjælper læseren med "
+#~ "at\n"
+#~ "installere Debian GNU/Linux samt opsætte netværkstjenester som web,\n"
+#~ "database, firewall, mail, ftp osv. på systemet. Man hjælpes også i gang\n"
+#~ "med at anvende GNU/Linux og Debians avancerede pakkehåndteringssystem."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "officiel Debian GNU/Linux 3.1r0a sarge på dvd (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Denne bog er opdelt i fire dele: grundlæggende koncepter, håndtering af "
+#~ "GNU/\n"
+#~ "Linux, administrering af systemet og avancerede handlinger. Hvert "
+#~ "kapitel\n"
+#~ "forklarer uddybende om styresystemets funktioner. De første kapitler\n"
+#~ "fortæller om GNU/Linux' struktur. Disse kapitler hjælper læseren med at\n"
+#~ "forstå hvordan systemet anvender grundlæggende ressourcer som "
+#~ "processoren\n"
+#~ "og hukommelsen. En detaljeret analyse af filsystemer, så som Ext2, Ext3\n"
+#~ "og ReiserFS gør det muligt for brugeren at foretage det rigtige valg til\n"
+#~ "deres behov. Mange illustrationen gennem bogen viser aspekter ved\n"
+#~ "systemets ydelse. Bogen er rettet med univeritetsstuderende og alle der\n"
+#~ "ønsker at lære GNU/Linux til bunds. Bogen dækker Debian sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Både begyndere og avancerede brugere kan bruge denne bog som en "
-#~ "udtømmende\n"
-#~ " kilde til oplysninger om anvendelse af Debian på desktop-maskiner, i\n"
-#~ " intranet og på internet-servere, samt til udvikling. Den indeholder "
-#~ "også\n"
-#~ " en omfattede dækning af Debians unikke pakkehåndteringssystem."
+#~ "Dette er den rigtige bog til dig, der vil lære hvordan man etablerer "
+#~ "grundlæggende og komplekse it-platforme udelukkende ved hjælp af fri "
+#~ "software. I bogen er der et bredt spektrum af procedurer, gennemgået og "
+#~ "justeret til at passe til bedste praksis ved implementering af "
+#~ "teknologiske infrastrukturer. Denne letlæste og udtømmende guide tager "
+#~ "dig i hånden med opfyldelse af specifikke mål med styresystemet Debian "
+#~ "GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live-cd med Knoppix"
+#~ msgid "Latest version in development:"
+#~ msgstr "Seneste udviklingsversion:"
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "Sarge-cd med installeringsprogram og et udvalg af pakker"
+#~ msgid "Language:"
+#~ msgstr "Sprog:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Brug <a href=\"cvs\">SVN</a> til at hente SGML-kildekodeteksten til <get-"
+#~ "var ddp_pkg_loc />."
+
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "En alternativ <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " udgivelse</a> er tilgængelig fra Lehmanns Fachbuchhandlung og koster\n"
+#~ " 29,95 € (pr. 2008)."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Denne bog er rettet med udviklere, der kører GNU/Linux på en ARM-"
+#~ "processor.\n"
+#~ " Visse enheder dækkes specifikt af hensyn til hurtig opsætning (LART, \n"
+#~ " Assabet, Psion5). Den giver også generelle oplysninger, værktøjer og\n"
+#~ " teknikker. GNU's toolchain er dækket i <q>native</q>- og <q>cross-"
+#~ "compiler</q>-form,\n"
+#~ " det samme gælder bootloaders, kernerettelser, RAM-diske, ARM-særheder "
+#~ "og\n"
+#~ " andre ARM-ressourcer. Den indeholder også udførlig indføring i basal "
+#~ "viden\n"
+#~ " om GNU/Linux for udviklere, der kommer fra andre platforme. Den er "
+#~ "ikke\n"
+#~ " Debian-specifik, men Aleph ARMLinux-distributionen er baseret nøje på\n"
+#~ " Debian-ARM og det forudsættes at man vil arbejde fra denne distribution "
+#~ "og\n"
+#~ " helst også har en Debian-baseret værtsmaskine."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 til ARM-arkitekturen"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a>-arkivet."
diff --git a/danish/po/l10n.da.po b/danish/po/l10n.da.po
index 45f6faf9b32..85edfced24a 100644
--- a/danish/po/l10n.da.po
+++ b/danish/po/l10n.da.po
@@ -94,11 +94,11 @@ msgstr "POT-filer"
msgid "Hints for translators"
msgstr "Tips til oversættere"
-#~ msgid "Original templates"
-#~ msgstr "Original skabelon"
+#~ msgid "Todo"
+#~ msgstr "Skal gøres"
#~ msgid "Translated templates"
#~ msgstr "Oversatte skabeloner"
-#~ msgid "Todo"
-#~ msgstr "Skal gøres"
+#~ msgid "Original templates"
+#~ msgstr "Original skabelon"
diff --git a/danish/po/mailinglists.da.po b/danish/po/mailinglists.da.po
index cadb770e460..fbf8ea69fc8 100644
--- a/danish/po/mailinglists.da.po
+++ b/danish/po/mailinglists.da.po
@@ -127,8 +127,8 @@ msgstr "åben"
msgid "closed"
msgstr "lukket"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Vælg de lister du ønsker at abonnere på:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Vælg hvilke lister du ønsker at ophæve abonnementet på:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Vælg de lister du ønsker at abonnere på:"
diff --git a/danish/po/organization.da.po b/danish/po/organization.da.po
index d0be772eefd..05f9e943e44 100644
--- a/danish/po/organization.da.po
+++ b/danish/po/organization.da.po
@@ -71,22 +71,22 @@ msgid "Officers"
msgstr "Bestyrelesesmedlemmer"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribution"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr "Kommunikation og opsøgende arbejde"
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Publicityhold"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Support og infrastruktur"
@@ -103,179 +103,179 @@ msgstr "Leder"
msgid "Technical Committee"
msgstr "Teknisk komité"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekretær"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Udviklingsprojekter"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Ftp-arkiv"
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Ftp-mastere"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Ftp-assistenter"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Ftp-troldmænd"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Backports-holdet"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Individuelle pakker"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Udgivelsesstyring"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Udgivelseshold"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Kvalitetssikring"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Startdisketter"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Udgivelsesbemærkninger"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Cd-aftryk"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Tester"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Autoopbygning og infrastruktur"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Wanna-build-hold"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Buildd-administration"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentation"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Pakker der skal arbejdes på og fremtidige pakker"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr "Debian Live Team"
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Tilpasninger"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Specielle systemer"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Bærbare"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Embedded systemer"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Pressekontakt"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Websider"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Opsøgning"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Debian Women-projektet"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Bekæmpelse af chikane"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Begivenheder"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "DebConf-komité"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Partnerskabsprogram"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Koordinering af hardwaredonationer"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Hjælp til brugere"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Fejlrapporteringssystem"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Postlisteadministration og postlistearkiver"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Reception for nye medlemmer"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debians kontoadministratorer"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -283,31 +283,31 @@ msgstr ""
"For at sende en privat besked til alle DAM'er, benyttes denne GPG-nøgle "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Vedligeholdere af nøglering (PGP og GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Sikkerhedsteam"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Konsulentside"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Cd-forhandlerside"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Retningslinjer"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Systemadministration"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -316,7 +316,7 @@ msgstr ""
"inklusive problemer med adgangskoder eller hvis du har brug for at en pakke "
"bliver installeret."
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -326,125 +326,141 @@ msgstr ""
"debian.org/machines.cgi\">Debians maskineside</a>, den skulle indeholde "
"administratoroplysninger for hver enkelt maskine."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator af LDAP-udvikleroversigten"
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Filspejle"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS-ansvarlig"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Pakkesporingssystem"
-#: ../../english/intro/organization.data:441
+#: ../../english/intro/organization.data:444
msgid "Treasurer"
msgstr "Kasserer"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:450
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:450
+#: ../../english/intro/organization.data:453
msgid "Salsa administrators"
msgstr "Salsa-administratorer"
-#: ../../english/intro/organization.data:454
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth-administratorer"
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian for børn mellem 1 og 99"
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian til lægepraksiser og forskning"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian til uddannelse"
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian på juridiske kontorer"
-#: ../../english/intro/organization.data:482
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian til handicappede"
-#: ../../english/intro/organization.data:486
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian til videnskabelig og relateret forskning"
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:492
msgid "Debian for astronomy"
msgstr "Debian til astronomi"
-#~ msgid "Auditor"
-#~ msgstr "Revisor"
+#~ msgid "Live System Team"
+#~ msgstr "Live System-holdet"
-#~ msgid "Publicity"
-#~ msgstr "PR"
+#~ msgid "DebConf chairs"
+#~ msgstr "DebConf-ledere"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Vedligeholdere af Debian Maintainer-nøglering (DM)"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "nuværende Debian-projektleder"
-#~ msgid "Bits from Debian"
-#~ msgstr "Bits fra Debian"
+#~ msgid "Testing Security Team"
+#~ msgstr "Testings Sikkerhedsteam"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Summer of Code 2013-administratorer"
+#~ msgid "Security Audit Project"
+#~ msgstr "Sikkerhedsauditprojektet"
-#~ msgid "Vendors"
-#~ msgstr "Forhandlere"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (ikke aktiv: blev ikke udgivet med squeeze)"
-#~ msgid "Handhelds"
-#~ msgstr "Håndholdte"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatile-hold"
-#~ msgid "Marketing Team"
-#~ msgstr "Marketingsholdet"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "De ansvarlige administratorer for buildd'erne til en bestemt arkitektur, "
+#~ "kan kontaktes på <genericemail arch@buildd.debian.org>, eksempelvis "
+#~ "<genericemail i386@buildd.debian.org>."
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinering af nøglesignering"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Navne på individuelle buildd'ers administratorer kan også findes på <a "
+#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Vælg en "
+#~ "arkitektur og en distribution, for at se de tilgængelige buildd'er og "
+#~ "deres administratorer."
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Debians skræddersyede distribution"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postlistearkiv"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Udgivelseshold vedr. den \"stabile\" udgave"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux til 'enterprise computing'"
-#~ msgid "Accountant"
-#~ msgstr "Bogholder"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Installationssystem til 'stable'"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Det universelle styresystem som din desktop"
+#~ msgid "Internal Projects"
+#~ msgstr "Interne projekter"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian for almennyttige organisationer"
+#~ msgid "Mailing list"
+#~ msgstr "Postliste"
-#~ msgid "APT Team"
-#~ msgstr "APT-team"
+#~ msgid "Installation"
+#~ msgstr "Installation"
-#~ msgid "Release Assistants"
-#~ msgstr "Udgivelsesassistenter"
+#~ msgid "Delegates"
+#~ msgstr "Delegerede"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Udgivelsesassistenter for den \"stabile\" udgave"
+#~ msgid "Debian-Med"
+#~ msgstr "Debian-Med"
-#~ msgid "Release Wizard"
-#~ msgstr "Udgivelsestroldmand"
+#~ msgid "Debian-Edu"
+#~ msgstr "Debian-Edu"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debians multimedie-distribution"
+#~ msgid "Debian-Desktop"
+#~ msgstr "Debian-Desktop"
+
+#~ msgid "Proposed Debian internal project."
+#~ msgstr "Foreslået internt Debian-projekt."
#~ msgid ""
#~ "This is not yet an official Debian internal project but it has announced "
@@ -453,75 +469,59 @@ msgstr "Debian til astronomi"
#~ "Dette er endnu ikke et officelt internt Debian-projekt, men ønsket om at "
#~ "blive integreret er blevet annonceret."
-#~ msgid "Proposed Debian internal project."
-#~ msgstr "Foreslået internt Debian-projekt."
-
-#~ msgid "Debian-Desktop"
-#~ msgstr "Debian-Desktop"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debians multimedie-distribution"
-#~ msgid "Debian-Edu"
-#~ msgstr "Debian-Edu"
+#~ msgid "Release Wizard"
+#~ msgstr "Udgivelsestroldmand"
-#~ msgid "Debian-Med"
-#~ msgstr "Debian-Med"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Udgivelsesassistenter for den \"stabile\" udgave"
-#~ msgid "Delegates"
-#~ msgstr "Delegerede"
+#~ msgid "Release Assistants"
+#~ msgstr "Udgivelsesassistenter"
-#~ msgid "Installation"
-#~ msgstr "Installation"
+#~ msgid "APT Team"
+#~ msgstr "APT-team"
-#~ msgid "Mailing list"
-#~ msgstr "Postliste"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian for almennyttige organisationer"
-#~ msgid "Internal Projects"
-#~ msgstr "Interne projekter"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Det universelle styresystem som din desktop"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Installationssystem til 'stable'"
+#~ msgid "Accountant"
+#~ msgstr "Bogholder"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux til 'enterprise computing'"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Udgivelseshold vedr. den \"stabile\" udgave"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postlistearkiv"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Debians skræddersyede distribution"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Navne på individuelle buildd'ers administratorer kan også findes på <a "
-#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Vælg en "
-#~ "arkitektur og en distribution, for at se de tilgængelige buildd'er og "
-#~ "deres administratorer."
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinering af nøglesignering"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "De ansvarlige administratorer for buildd'erne til en bestemt arkitektur, "
-#~ "kan kontaktes på <genericemail arch@buildd.debian.org>, eksempelvis "
-#~ "<genericemail i386@buildd.debian.org>."
+#~ msgid "Marketing Team"
+#~ msgstr "Marketingsholdet"
-#~ msgid "Volatile Team"
-#~ msgstr "Volatile-hold"
+#~ msgid "Handhelds"
+#~ msgstr "Håndholdte"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (ikke aktiv: blev ikke udgivet med squeeze)"
+#~ msgid "Vendors"
+#~ msgstr "Forhandlere"
-#~ msgid "Security Audit Project"
-#~ msgstr "Sikkerhedsauditprojektet"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Summer of Code 2013-administratorer"
-#~ msgid "Testing Security Team"
-#~ msgstr "Testings Sikkerhedsteam"
+#~ msgid "Bits from Debian"
+#~ msgstr "Bits fra Debian"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "nuværende Debian-projektleder"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Vedligeholdere af Debian Maintainer-nøglering (DM)"
-#~ msgid "DebConf chairs"
-#~ msgstr "DebConf-ledere"
+#~ msgid "Publicity"
+#~ msgstr "PR"
-#~ msgid "Live System Team"
-#~ msgstr "Live System-holdet"
+#~ msgid "Auditor"
+#~ msgstr "Revisor"
diff --git a/danish/po/others.da.po b/danish/po/others.da.po
index 01acca3faf1..e79030932b2 100644
--- a/danish/po/others.da.po
+++ b/danish/po/others.da.po
@@ -325,126 +325,91 @@ msgstr "Version"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Navn:"
-
-#~ msgid "Company:"
-#~ msgstr "Firma:"
-
-#~ msgid "URL:"
-#~ msgstr "Webadresse:"
+#~ msgid "Wanted:"
+#~ msgstr "Ønskes:"
-#~ msgid "or"
-#~ msgstr "eller"
+#~ msgid "Who:"
+#~ msgstr "Hvem:"
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
+#~ msgid "Architecture:"
+#~ msgstr "Arkitektur:"
-#~ msgid "Rates:"
-#~ msgstr "Priser:"
+#~ msgid "Specifications:"
+#~ msgstr "Specifikationer:"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Kan flytte"
+#~ msgid "Where:"
+#~ msgstr "Hvor:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> Debian-konsulenter i <total_country> lande over hele "
-#~ "verden er vist ."
+#~ msgid "p<get-var page />"
+#~ msgstr "s.<get-var page />"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Postliste-abonnement"
+#~ msgid "Previous Talks:"
+#~ msgstr "Tidligere foredrag:"
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
-#~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postliste</a>-siden for oplysninger om hvordan "
-#~ "man tegner abonnement via e-mail. Der findes også en webformular til <a "
-#~ "href=\"unsubscribe\">ophævelse af abonnement</a> på postlister. "
+#~ msgid "Languages:"
+#~ msgstr "Sprog:"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Bemærk at de fleste af Debians postlister er offentlige forummer. Alle e-"
-#~ "mails der sendes til listerne, vil kunne ses i de offentlige "
-#~ "postlistearkiver og de vil blive indekseret af søgemaskiner. Du bør kun "
-#~ "tegne abonnement på Debians postlister med en e-mail-adresse, som gerne "
-#~ "må offentliggøres."
+#~ msgid "Location:"
+#~ msgstr "Sted:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Vælg de lister du ønsker at abonnere på:"
+#~ msgid "Topics:"
+#~ msgstr "Emner:"
-#~ msgid "No description given"
-#~ msgstr "Beskrivelse mangler"
+#~ msgid "rc3 (broken)"
+#~ msgstr "rc3 (fungerer ikke)"
-#~ msgid "Moderated:"
-#~ msgstr "Modereret:"
+#~ msgid "rc3"
+#~ msgstr "rc3"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Kun abonnenter kan sende til listen."
+#~ msgid "rc2 (broken)"
+#~ msgstr "rc2 (fungerer ikke)"
-#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
-#~ msgstr ""
-#~ "Kun beskeder signeret af en Debian-udvikler accepteres på denne liste."
+#~ msgid "rc2"
+#~ msgstr "rc2"
-#~ msgid "Subscription:"
-#~ msgstr "Abonnement:"
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
+#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "er kun læsbar, sammendragsversion."
+#~ msgid "Debian: The Perfect OS"
+#~ msgstr "Debian: The Perfect OS"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Din e-mail-adresse:"
+#~ msgid "Debian: The biggest is still the best."
+#~ msgstr "Debian: The biggest is still the best."
-#~ msgid "Subscribe"
-#~ msgstr "Abonnér"
+#~ msgid "Older Debian banners"
+#~ msgstr "Ældre Debian-bannere"
-#~ msgid "Clear"
-#~ msgstr "Nulstil"
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: the potato has landed. announcing version 2.2"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr ""
-#~ "Overhold venligst <a href=\"./#ads\">Debians annonceringsregler for "
-#~ "postlisterne</a>."
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get into it."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Ophæv abonnement på postliste"
+#~ msgid "Newer Debian banners"
+#~ msgstr "Nyere Debian-bannere"
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
-#~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postliste</a>-siden for oplysninger om hvordan "
-#~ "man ophæver abonnement via e-mail. Der findes også en webformular til <a "
-#~ "href=\"subscribe\">tegning af abonnement</a> på postlister. "
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "animeret&nbsp;GIF-banner"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Vælg hvilke lister du ønsker at ophæve abonnementet på:"
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "horisontalt&nbsp;banner"
-#~ msgid "Unsubscribe"
-#~ msgstr "Ophæv"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "vertikalt&nbsp;banner"
-#~ msgid "open"
-#~ msgstr "åben"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "kun Debians tekniske komité"
-#~ msgid "closed"
-#~ msgstr "lukket"
+#~ msgid "deity developers only"
+#~ msgstr "kun deity-udviklere"
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
+#~ msgid "developers only"
+#~ msgstr "kun udviklere"
-#~ msgid "Q"
-#~ msgstr "Sp"
+#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
+#~ msgstr ""
+#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">flere oplysninger</"
+#~ "a>)"
#~ msgid ""
#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">more info</a>)"
@@ -452,88 +417,123 @@ msgstr "URL"
#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.html\">flere "
#~ "oplysninger</a>)"
-#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
-#~ msgstr ""
-#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">flere oplysninger</"
-#~ "a>)"
+#~ msgid "Q"
+#~ msgstr "Sp"
-#~ msgid "developers only"
-#~ msgstr "kun udviklere"
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
-#~ msgid "deity developers only"
-#~ msgstr "kun deity-udviklere"
+#~ msgid "closed"
+#~ msgstr "lukket"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "kun Debians tekniske komité"
+#~ msgid "open"
+#~ msgstr "åben"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "vertikalt&nbsp;banner"
+#~ msgid "Unsubscribe"
+#~ msgstr "Ophæv"
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "horisontalt&nbsp;banner"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Vælg hvilke lister du ønsker at ophæve abonnementet på:"
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "animeret&nbsp;GIF-banner"
+#~ msgid ""
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ msgstr ""
+#~ "Se <a href=\"./#subunsub\">postliste</a>-siden for oplysninger om hvordan "
+#~ "man ophæver abonnement via e-mail. Der findes også en webformular til <a "
+#~ "href=\"subscribe\">tegning af abonnement</a> på postlister. "
-#~ msgid "Newer Debian banners"
-#~ msgstr "Nyere Debian-bannere"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Ophæv abonnement på postliste"
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get into it."
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr ""
+#~ "Overhold venligst <a href=\"./#ads\">Debians annonceringsregler for "
+#~ "postlisterne</a>."
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: the potato has landed. announcing version 2.2"
+#~ msgid "Clear"
+#~ msgstr "Nulstil"
-#~ msgid "Older Debian banners"
-#~ msgstr "Ældre Debian-bannere"
+#~ msgid "Subscribe"
+#~ msgstr "Abonnér"
-#~ msgid "Debian: The biggest is still the best."
-#~ msgstr "Debian: The biggest is still the best."
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Din e-mail-adresse:"
-#~ msgid "Debian: The Perfect OS"
-#~ msgstr "Debian: The Perfect OS"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "er kun læsbar, sammendragsversion."
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
-#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
-#~ msgid "rc2"
-#~ msgstr "rc2"
+#~ msgid ""
+#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ msgstr ""
+#~ "Kun beskeder signeret af en Debian-udvikler accepteres på denne liste."
-#~ msgid "rc2 (broken)"
-#~ msgstr "rc2 (fungerer ikke)"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Kun abonnenter kan sende til listen."
-#~ msgid "rc3"
-#~ msgstr "rc3"
+#~ msgid "Moderated:"
+#~ msgstr "Modereret:"
-#~ msgid "rc3 (broken)"
-#~ msgstr "rc3 (fungerer ikke)"
+#~ msgid "No description given"
+#~ msgstr "Beskrivelse mangler"
-#~ msgid "Topics:"
-#~ msgstr "Emner:"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Vælg de lister du ønsker at abonnere på:"
-#~ msgid "Location:"
-#~ msgstr "Sted:"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "Bemærk at de fleste af Debians postlister er offentlige forummer. Alle e-"
+#~ "mails der sendes til listerne, vil kunne ses i de offentlige "
+#~ "postlistearkiver og de vil blive indekseret af søgemaskiner. Du bør kun "
+#~ "tegne abonnement på Debians postlister med en e-mail-adresse, som gerne "
+#~ "må offentliggøres."
-#~ msgid "Languages:"
-#~ msgstr "Sprog:"
+#~ msgid ""
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ msgstr ""
+#~ "Se <a href=\"./#subunsub\">postliste</a>-siden for oplysninger om hvordan "
+#~ "man tegner abonnement via e-mail. Der findes også en webformular til <a "
+#~ "href=\"unsubscribe\">ophævelse af abonnement</a> på postlister. "
-#~ msgid "Previous Talks:"
-#~ msgstr "Tidligere foredrag:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postliste-abonnement"
-#~ msgid "p<get-var page />"
-#~ msgstr "s.<get-var page />"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> Debian-konsulenter i <total_country> lande over hele "
+#~ "verden er vist ."
-#~ msgid "Where:"
-#~ msgstr "Hvor:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Kan flytte"
-#~ msgid "Specifications:"
-#~ msgstr "Specifikationer:"
+#~ msgid "Rates:"
+#~ msgstr "Priser:"
-#~ msgid "Architecture:"
-#~ msgstr "Arkitektur:"
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
-#~ msgid "Who:"
-#~ msgstr "Hvem:"
+#~ msgid "or"
+#~ msgstr "eller"
-#~ msgid "Wanted:"
-#~ msgstr "Ønskes:"
+#~ msgid "URL:"
+#~ msgstr "Webadresse:"
+
+#~ msgid "Company:"
+#~ msgstr "Firma:"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
diff --git a/danish/po/partners.da.po b/danish/po/partners.da.po
index 866ab4afe52..f0792aaaec2 100644
--- a/danish/po/partners.da.po
+++ b/danish/po/partners.da.po
@@ -128,9 +128,9 @@ msgid ""
msgstr ""
"Lige fra begyndelsen har credativ aktivtet støttet Debian-projektet, og vil "
"fortsætte med det i fremtiden. Desuden er mange af vores konsulenter også "
-"Debian-udviklere og aktivet involveret i at bidrage til fri software-projekter "
-"over hele verden. Yderligere oplysninger finder man på "
-"<url \"http://www.credativ.com/\">."
+"Debian-udviklere og aktivet involveret i at bidrage til fri software-"
+"projekter over hele verden. Yderligere oplysninger finder man på <url "
+"\"http://www.credativ.com/\">."
#: ../../english/partners/partners.def:72
msgid ""
@@ -670,6 +670,16 @@ msgstr ""
"værktøjer og styresystemer."
#~ msgid ""
+#~ "credativ is a service oriented company focusing on open-source software "
+#~ "since its foundation in 1999. World-wide Debian support is provided by "
+#~ "credativ's <q>Open Source Support Centers</q> around the globe."
+#~ msgstr ""
+#~ " credativ er en serviceorienteret virksomhed med fokus på open source-"
+#~ "software siden grundlæggelsen i 1999. Gennem credativs verdensomspændende "
+#~ "<q>Open Source Support Centers</q> tilbydes Debian-support over hele "
+#~ "verden."
+
+#~ msgid ""
#~ "A large number of credativ staff are Debian developers, several of them "
#~ "very well know in the community. From the very beginning credativ has "
#~ "actively supported the Debian project. For more information please visit "
@@ -679,13 +689,3 @@ msgstr ""
#~ "er særdeles kendte i fællesskabet. Helt fra begyndelsen har credativ "
#~ "aktivt støttet Debian-projektet. Besøg venligst <url \"http://www."
#~ "credativ.com/\"> for flere oplysninger."
-
-#~ msgid ""
-#~ "credativ is a service oriented company focusing on open-source software "
-#~ "since its foundation in 1999. World-wide Debian support is provided by "
-#~ "credativ's <q>Open Source Support Centers</q> around the globe."
-#~ msgstr ""
-#~ " credativ er en serviceorienteret virksomhed med fokus på open source-"
-#~ "software siden grundlæggelsen i 1999. Gennem credativs verdensomspændende "
-#~ "<q>Open Source Support Centers</q> tilbydes Debian-support over hele "
-#~ "verden."
diff --git a/danish/po/ports.da.po b/danish/po/ports.da.po
index bb7ec2df2fc..b40f7f8c8e8 100644
--- a/danish/po/ports.da.po
+++ b/danish/po/ports.da.po
@@ -113,135 +113,135 @@ msgstr "Debian til PowerPC"
msgid "Debian for Sparc"
msgstr "Debian til Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian til bærbare"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian til AMD64"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD-controller, Compact Flash, UART, parallel, RTC, tastatur, "
-#~ "USB, touchpad, audio"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian til ARM"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, parallel, RTC, audio, PCIC"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian til Beowulf"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, tastatur, TouchPanel, audio, Compact-Flash, UART, parallel"
+#~ msgid "Main"
+#~ msgstr "Forside"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2-cache på chip'en"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian til Motorola 680x0"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, ekstern 64-bits bus, ekstern L2-cache"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian til MIPS"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, ekstern 64-bits bus"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian til S/390"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, ekstern 32-bits bus"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian til Sparc64"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 ethernet, 4 UART, IrDA, AC'97, I2C, 38 digital I/O"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "libc5-baseret Debian GNU/FreeBSD"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, DMAC, PCIC, UART, timer"
+#~ msgid "Vendor/Name"
+#~ msgstr "Fabrikant/navn"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, IrDA"
+#~ msgid "Date announced"
+#~ msgstr "Annonceret den"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, LCD-controller, IrDA"
+#~ msgid "Clock"
+#~ msgstr "Klokfrekvens"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, timer, PCMCIA, LCD-controller, IrDA"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, PCIC, UART, timer"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer, I2C, LCD-controller"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
-#~ msgstr ""
-#~ "Mips16 ISA-udvidelse, ingen FPU, 512k flash, 16k RAM, DMAC, UART, timer, "
-#~ "I2C, watchdog"
+#~ msgid "Specials"
+#~ msgstr "Særegenheder"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "CPU med flere chips"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Ingen FPU (R2010), ekstern cache"
-#~ msgid "External L1 cache"
-#~ msgstr "Ekstern L1-cache"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Ingen FPU (R3010)"
#~ msgid "Virtual indexed L1 cache, L2 cache controller"
#~ msgstr "Virtuelt indekseret L1-cache, L2-cache-controller"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Ingen FPU (R3010)"
+#~ msgid "External L1 cache"
+#~ msgstr "Ekstern L1-cache"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Ingen FPU (R2010), ekstern cache"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "CPU med flere chips"
-#~ msgid "Specials"
-#~ msgstr "Særegenheder"
+#~ msgid ""
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
+#~ msgstr ""
+#~ "Mips16 ISA-udvidelse, ingen FPU, 512k flash, 16k RAM, DMAC, UART, timer, "
+#~ "I2C, watchdog"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer, I2C, LCD-controller"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, PCIC, UART, timer"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, timer, PCMCIA, LCD-controller, IrDA"
-#~ msgid "Clock"
-#~ msgstr "Klokfrekvens"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, LCD-controller, IrDA"
-#~ msgid "Date announced"
-#~ msgstr "Annonceret den"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, IrDA"
-#~ msgid "Vendor/Name"
-#~ msgstr "Fabrikant/navn"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, DMAC, PCIC, UART, timer"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "libc5-baseret Debian GNU/FreeBSD"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 ethernet, 4 UART, IrDA, AC'97, I2C, 38 digital I/O"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian til Sparc64"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, ekstern 32-bits bus"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian til S/390"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, ekstern 64-bits bus"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian til MIPS"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, ekstern 64-bits bus, ekstern L2-cache"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian til Motorola 680x0"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2-cache på chip'en"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Main"
-#~ msgstr "Forside"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, tastatur, TouchPanel, audio, Compact-Flash, UART, parallel"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian til Beowulf"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, parallel, RTC, audio, PCIC"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian til ARM"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD-controller, Compact Flash, UART, parallel, RTC, tastatur, "
+#~ "USB, touchpad, audio"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian til AMD64"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian til bærbare"
diff --git a/danish/po/stats.da.po b/danish/po/stats.da.po
index 394a5b57ad2..c8b142cfea7 100644
--- a/danish/po/stats.da.po
+++ b/danish/po/stats.da.po
@@ -19,79 +19,90 @@ msgstr "Der er %d bytes at oversætte."
msgid "There are %d strings to translate."
msgstr "Der er %d strenge at oversætte."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Denne oversættelse er forældet"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Forkert oversættelsesversion"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Denne oversættelse er forældet"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Originalen er nyere end denne oversættelse"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Originalen findes ikke længere"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "antal forekomster ikke tilgængelig"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "forekomster"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Klik for at hente diffstat-data"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Samlet diff"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Farvelagt diff"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Farvelagt diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Oprettet med <transstatslink>"
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Oversættelsesresume for"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Ikke oversat"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Forældet"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Oversat"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Ajourført"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "filer"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -99,139 +110,139 @@ msgstr ""
"Note: Listerne over sider er sorteret efter popularitet. Svæv over "
"sidenavnet for at se antallet af forekomster."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Forældede oversættelser"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Fil"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Kommentar"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Oversættelse"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Vedligeholder"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Oversætter"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Dato"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Generelle sider ikke oversat"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Uoversatte generelle sider"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Nyheder ikke oversat"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Uoversatte nyheder"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Konsulent-/brugersider ikke oversat"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Uoversatte konsulent-/brugersider"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Internationale sider ikke oversat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Uoversatte internationale sider"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Oversatte sider (ajourførte)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Oversatte skabeloner (PO-filer)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Statistik over PO-oversættelser"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Fuzzy"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Uoversat"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Oversatte websider"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Oversættelsesstatistik efter antal sider"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Sprog"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Oversættelser"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Oversatte websider (efter størrelse)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Oversættelsesstatistik efter sidestørrelse"
-#~ msgid "Origin"
-#~ msgstr "Ophav"
+#~ msgid "Created with"
+#~ msgstr "Oprettet med"
#~ msgid "Hit data from %s, gathered %s."
#~ msgstr "Forekomstdata fra %s, indsamlet %s."
-#~ msgid "Created with"
-#~ msgstr "Oprettet med"
+#~ msgid "Origin"
+#~ msgstr "Ophav"
diff --git a/danish/po/templates.da.po b/danish/po/templates.da.po
index 52beb358f76..cab4b7b57ed 100644
--- a/danish/po/templates.da.po
+++ b/danish/po/templates.da.po
@@ -192,19 +192,25 @@ msgstr "i version 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"For at rapportere et problem med webstedet, sendes en e-mail på engelsk til "
-"vores offentligt arkiverede postliste "
-"<a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</"
-"a>. Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for andre "
-"kontaktoplysninger. Webstedets kildekode er <a href=\"m4_HOME/devel/website/"
-"using_cvs\">tilgængelig</a>."
+"vores offentligt arkiverede postliste <a href=\"mailto:debian-www@lists."
+"debian.org\">debian-www@lists.debian.org</a>. Se Debians <a href=\"m4_HOME/"
+"contact\">kontaktside</a> for andre kontaktoplysninger. Webstedets "
+"kildekode er <a href=\"m4_HOME/devel/website/using_cvs\">tilgængelig</a>."
#: ../../english/template/debian/footer.wml:108
msgid "Last Modified"
@@ -497,6 +503,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Bemærk:</em> Originalen findes ikke længere."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -505,337 +515,295 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Tilbage til <a href=\"./\">Hvem bruger Debian?-siden</a>."
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Besøg vores sponsor"
+#~ msgid "Select a server near you"
+#~ msgstr "Vælg en server i nærheden af dig"
-#~ msgid "More information:"
-#~ msgstr "Flere oplysninger:"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulentliste"
-#~ msgid "Taken by:"
-#~ msgstr "Overtaget af:"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tilbage til <a href=\"./\">Debians konsulentside</a>."
-#~ msgid "Nobody"
-#~ msgstr "Ingen"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Rating:"
-#~ msgstr "Grad:"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Hent med Jigdo"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Har du fundet et problem med webstedets layout?"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Hent via http/ftp"
-#~ msgid "Report it!"
-#~ msgstr "Rapporter det!"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Køb cd'er eller dvd'er"
-#~ msgid "More information"
-#~ msgstr "Yderligere oplysninger"
+#~ msgid "Network Install"
+#~ msgstr "Netværksinstallering"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kommende begivenheder"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Hent"
-#~ msgid "link may no longer be valid"
-#~ msgstr "Linket kan være forældet"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Diverse"
-#~ msgid "When"
-#~ msgstr "Hvornår"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Kunst"
-#~ msgid "Where"
-#~ msgstr "Hvor"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Spejling"
-#~ msgid "More Info"
-#~ msgstr "Yderligere oplysninger"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-spejle"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debians involvering"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Hent med Torrent"
-#~ msgid "Main Coordinator"
-#~ msgstr "Hovedkoordinator"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Aftryksoplysninger"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
+#~ msgid "Debian CD team"
+#~ msgstr "Debians cd-team"
-#~ msgid "Related Links"
-#~ msgstr "Relaterede links"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian på cd"
-#~ msgid "Latest News"
-#~ msgstr "Seneste nyt"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "oss"
-#~ msgid "Download calendar entry"
-#~ msgstr "Hent kalenderpost"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Tilbage til: andre <a href=\"./\">Debian-nyheder</a> || <a href=\"m4_HOME/"
-#~ "\">Debian-projektets hjemmeside</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http/ftp"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (dødt link)"
+#~ msgid "buy"
+#~ msgstr "køb"
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "For at få dette nyhedsbrev som e-mail hver anden uge, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
+#~ msgid "net_install"
+#~ msgstr "netinstall"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Tidligere udgaver</a> af nyhedsbrevet er tilgængelige."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "div"
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"singular\" />Debians projektnyheder redigeres af <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "Engelsksproget <a href=\"/MailingLists/disclaimer\">offentlig postliste</"
+#~ "a> vedr. cd'er/dvd'er:"
-#~ msgid ""
-#~ "<void id=\"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>."
+#~ msgid "Date"
+#~ msgstr "Dato"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Denne udgave af Debians projektnyheder blev "
-#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Tidslinje"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Denne udgave af Debians projektnyheder blev "
-#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Nomineringer"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Den blev oversat af %s."
+#~ msgid "Debate"
+#~ msgstr "Debat"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Den blev oversat af %s."
+#~ msgid "Platforms"
+#~ msgstr "Platforme"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Den blev oversat af %s."
+#~ msgid "Proposer"
+#~ msgstr "Forslagsstiller"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Den blev oversat af %s."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Forslags A's forslagsstiller"
-#~ msgid "List of Speakers"
-#~ msgstr "Liste med foredragsholdere"
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Forslags B's forslagsstiller"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Tilbage til <a href=\"./\">Debians foredragsholderside</a>."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Forslags C's forslagsstiller"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "For at få dette nyhedsbrev som e-mail hver uge, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Forslags D's forslagsstiller"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Weekly News redigeres af <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Forslags E's forslagsstiller"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Weekly News redigeres af <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Forslags F's forslagsstiller"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Denne udgave af Debian Weekly News blev redigeret "
-#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Seconds"
+#~ msgstr "Støtter"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Denne udgave af Debian Weekly News blev redigeret "
-#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Forslags A's støtter"
-#~ msgid "No requests for adoption"
-#~ msgstr "Ingen adoptionsforespørglser"
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Forslags B's støtter"
-#~ msgid "No orphaned packages"
-#~ msgstr "Ingen forældreløse pakker"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Forslags C's støtter"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Ingen pakker som venter på at blive adopteret"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Forslags D's støtter"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Ingen pakker som venter på at blive pakket"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Forslags E's støtter"
-#~ msgid "No Requested packages"
-#~ msgstr "Ingen efterspurgte pakker"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Forslags F's støtter"
-#~ msgid "No help requested"
-#~ msgstr "Ingen hjælp ønsket"
+#~ msgid "Opposition"
+#~ msgstr "Opposition"
-#~ msgid "in adoption since today."
-#~ msgstr "under adoption siden i dag."
+#~ msgid "Text"
+#~ msgstr "Tekst"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "under adoption siden i går."
+#~ msgid "Proposal A"
+#~ msgstr "Forslag A"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s dage under adoption."
+#~ msgid "Proposal B"
+#~ msgstr "Forslag B"
-#~ msgid "in preparation since today."
-#~ msgstr "under forberedelse siden i dag."
+#~ msgid "Proposal C"
+#~ msgstr "Forslag C"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "under forberedelse siden i går."
+#~ msgid "Proposal D"
+#~ msgstr "Forslag D"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s dage under forberedelse."
+#~ msgid "Proposal E"
+#~ msgstr "Forslag E"
-#~ msgid "requested today."
-#~ msgstr "efterspurgt i dag."
+#~ msgid "Proposal F"
+#~ msgstr "Forslag F"
-#~ msgid "requested yesterday."
-#~ msgstr "efterspurgt i går."
+#~ msgid "Choices"
+#~ msgstr "Valgmuligheder"
-#~ msgid "requested %s days ago."
-#~ msgstr "efterspurgt i %s dage."
+#~ msgid "Amendment Proposer"
+#~ msgstr "Ændringens forslagstiller"
-#~ msgid "package info"
-#~ msgstr "pakkeinfo"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Ændringens støtter"
-#~ msgid "License Information"
-#~ msgstr "Licensoplysninger"
+#~ msgid "Amendment Text"
+#~ msgstr "Ændringens tekst"
-#~ msgid "DLS Index"
-#~ msgstr "DLS-indeks"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Ændringens forslagstiller A"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Ændringens støtter A"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG-OSS"
+#~ msgid "Amendment Text A"
+#~ msgstr "Ændringens tekst A"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legals arkiv"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Ændringens forslagstiller B"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Ændringens støtter B"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Version %s: %s"
+#~ msgid "Amendment Text B"
+#~ msgstr "Ændringens tekst B"
-#~ msgid "Date published"
-#~ msgstr "Offentliggørelsesdato"
+#~ msgid "Amendments"
+#~ msgstr "Ændringsforslag"
-#~ msgid "License"
-#~ msgstr "Licens"
+#~ msgid "Proceedings"
+#~ msgstr "Forløb"
-#~ msgid "Version"
-#~ msgstr "Version"
+#~ msgid "Majority Requirement"
+#~ msgstr "Flertalskrav"
-#~ msgid "Summary"
-#~ msgstr "Sammendrag"
+#~ msgid "Data and Statistics"
+#~ msgstr "Data og statistik"
-#~ msgid "Justification"
-#~ msgstr "Begrundelse"
+#~ msgid "Quorum"
+#~ msgstr "Beslutningsdygtigt flertal"
-#~ msgid "Discussion"
-#~ msgstr "Diskussion"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Minimal diskussion"
-#~ msgid "Original Summary"
-#~ msgstr "Originalt sammendrag"
+#~ msgid "Ballot"
+#~ msgstr "Stemme"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Det originale sammendrag af <summary-author/> findes i <a href=\"<summary-"
-#~ "url/>\">listearkivet</a>."
+#~ msgid "Forum"
+#~ msgstr "Forum"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Dette sammendrag blev forberedt af <summary-author/>."
+#~ msgid "Outcome"
+#~ msgstr "Resultat"
-#~ msgid "License text (translated)"
-#~ msgstr "Licenstekst (oversat)"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Venter&nbsp;på&nbsp;en&nbsp;sponsor"
-#~ msgid "License text"
-#~ msgstr "Licenstekst"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Under&nbsp;diskussion"
-#~ msgid "free"
-#~ msgstr "fri"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Afstemning&nbsp;åben"
-#~ msgid "non-free"
-#~ msgstr "ikke-fri"
+#~ msgid "Decided"
+#~ msgstr "Besluttet"
-#~ msgid "not redistributable"
-#~ msgstr "ikke videredistribuérbar"
+#~ msgid "Withdrawn"
+#~ msgstr "Tilbagetrukket"
-#~ msgid "Free"
-#~ msgstr "Fri"
+#~ msgid "Other"
+#~ msgstr "Andet"
-#~ msgid "Non-Free"
-#~ msgstr "Ikke-fri"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hjem&nbsp;til&nbsp;afstemningssiden"
-#~ msgid "Not Redistributable"
-#~ msgstr "Ikke videredistribuérbar"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hvordan&nbsp;man&nbsp;..."
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Se siden med <a href=\"./\">licensoplysninger</a> for en oversigt over "
-#~ "Debians licenssammendrag (DLS)."
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Afgiver&nbsp;et&nbsp;forslag"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ændrer&nbsp;et&nbsp;forslag"
-#~ msgid "discussed"
-#~ msgstr "diskuteret"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Følger&nbsp;et&nbsp;forslag"
-#~ msgid "Please use English when sending mail."
-#~ msgstr "Brug venligst engelsk når du sender e-mail"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Læser&nbsp;et&nbsp;resultat"
-#~ msgid "CERT vulnerabilities"
-#~ msgstr "CERT-sårbarheder"
+#~ msgid "Vote"
+#~ msgstr "Stemmer"
-#~ msgid "CERT alerts"
-#~ msgstr "CERT-advarsler"
+#~ msgid "network install"
+#~ msgstr "netværksinstallering"
-#~ msgid "Securityfocus Bugtraq database"
-#~ msgstr "Securityfocus' Bugtraq-database"
+#~ msgid "buy pre-made images"
+#~ msgstr "køb færdige cd-aftryk"
-#~ msgid "Mitre CVE dictionary"
-#~ msgstr "I Mitres CVE-ordbog:"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Tilbage til andre <a href=\"./\">Debian-nyheder</a>."
-#~ msgid "Security database references"
-#~ msgstr "Referencer i sikkerhedsdatabaser"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for oplysninger om "
+#~ "at kontakte os."
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "I Mitres CVE-ordbog:"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debians sikkerhedsbulletin"
-#~ msgid "BugTraq ID"
-#~ msgstr "BugTraq-id"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debians sikkerhedsbulletiner"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
+#~ msgid "Date Reported"
+#~ msgstr "Rapporteret den"
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERTs noter om sårbarheder, bulletiner og hændelser:"
+#~ msgid "Vulnerable"
+#~ msgstr "Sårbar"
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "Der er pt. ingen tilgængelige eksterne sikkerhedsreferencer i andre "
-#~ "databaser."
+#~ msgid "Fixed in"
+#~ msgstr "Rettet i"
+
+#~ msgid "Source:"
+#~ msgstr "Kildekode:"
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arkitekturuafhængig komponent:"
#~ msgid ""
#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
@@ -844,292 +812,334 @@ msgstr "Tilbage til <a href=\"./\">Hvem bruger Debian?-siden</a>."
#~ "MD5-kontrolsummer for de listede filer findes i den <a href=\"<get-var "
#~ "url />\">originale sikkerhedsbulletin</a>."
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arkitekturuafhængig komponent:"
-
-#~ msgid "Source:"
-#~ msgstr "Kildekode:"
-
-#~ msgid "Fixed in"
-#~ msgstr "Rettet i"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Der er pt. ingen tilgængelige eksterne sikkerhedsreferencer i andre "
+#~ "databaser."
-#~ msgid "Vulnerable"
-#~ msgstr "Sårbar"
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERTs noter om sårbarheder, bulletiner og hændelser:"
-#~ msgid "Date Reported"
-#~ msgstr "Rapporteret den"
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debians sikkerhedsbulletiner"
+#~ msgid "BugTraq ID"
+#~ msgstr "BugTraq-id"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debians sikkerhedsbulletin"
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "I Mitres CVE-ordbog:"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for oplysninger om "
-#~ "at kontakte os."
+#~ msgid "Security database references"
+#~ msgstr "Referencer i sikkerhedsdatabaser"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Tilbage til andre <a href=\"./\">Debian-nyheder</a>."
+#~ msgid "Mitre CVE dictionary"
+#~ msgstr "I Mitres CVE-ordbog:"
-#~ msgid "buy pre-made images"
-#~ msgstr "køb færdige cd-aftryk"
+#~ msgid "Securityfocus Bugtraq database"
+#~ msgstr "Securityfocus' Bugtraq-database"
-#~ msgid "network install"
-#~ msgstr "netværksinstallering"
+#~ msgid "CERT alerts"
+#~ msgstr "CERT-advarsler"
-#~ msgid "Vote"
-#~ msgstr "Stemmer"
+#~ msgid "CERT vulnerabilities"
+#~ msgstr "CERT-sårbarheder"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Læser&nbsp;et&nbsp;resultat"
+#~ msgid "Please use English when sending mail."
+#~ msgstr "Brug venligst engelsk når du sender e-mail"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Følger&nbsp;et&nbsp;forslag"
+#~ msgid "discussed"
+#~ msgstr "diskuteret"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ændrer&nbsp;et&nbsp;forslag"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Afgiver&nbsp;et&nbsp;forslag"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Se siden med <a href=\"./\">licensoplysninger</a> for en oversigt over "
+#~ "Debians licenssammendrag (DLS)."
-#~ msgid "How&nbsp;To"
-#~ msgstr "Hvordan&nbsp;man&nbsp;..."
+#~ msgid "Not Redistributable"
+#~ msgstr "Ikke videredistribuérbar"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hjem&nbsp;til&nbsp;afstemningssiden"
+#~ msgid "Non-Free"
+#~ msgstr "Ikke-fri"
-#~ msgid "Other"
-#~ msgstr "Andet"
+#~ msgid "Free"
+#~ msgstr "Fri"
-#~ msgid "Withdrawn"
-#~ msgstr "Tilbagetrukket"
+#~ msgid "not redistributable"
+#~ msgstr "ikke videredistribuérbar"
-#~ msgid "Decided"
-#~ msgstr "Besluttet"
+#~ msgid "non-free"
+#~ msgstr "ikke-fri"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Afstemning&nbsp;åben"
+#~ msgid "free"
+#~ msgstr "fri"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Under&nbsp;diskussion"
+#~ msgid "License text"
+#~ msgstr "Licenstekst"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Venter&nbsp;på&nbsp;en&nbsp;sponsor"
+#~ msgid "License text (translated)"
+#~ msgstr "Licenstekst (oversat)"
-#~ msgid "Outcome"
-#~ msgstr "Resultat"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Dette sammendrag blev forberedt af <summary-author/>."
-#~ msgid "Forum"
-#~ msgstr "Forum"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Det originale sammendrag af <summary-author/> findes i <a href=\"<summary-"
+#~ "url/>\">listearkivet</a>."
-#~ msgid "Ballot"
-#~ msgstr "Stemme"
+#~ msgid "Original Summary"
+#~ msgstr "Originalt sammendrag"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Minimal diskussion"
+#~ msgid "Discussion"
+#~ msgstr "Diskussion"
-#~ msgid "Quorum"
-#~ msgstr "Beslutningsdygtigt flertal"
+#~ msgid "Justification"
+#~ msgstr "Begrundelse"
-#~ msgid "Data and Statistics"
-#~ msgstr "Data og statistik"
+#~ msgid "Summary"
+#~ msgstr "Sammendrag"
-#~ msgid "Majority Requirement"
-#~ msgstr "Flertalskrav"
+#~ msgid "Version"
+#~ msgstr "Version"
-#~ msgid "Proceedings"
-#~ msgstr "Forløb"
+#~ msgid "License"
+#~ msgstr "Licens"
-#~ msgid "Amendments"
-#~ msgstr "Ændringsforslag"
+#~ msgid "Date published"
+#~ msgstr "Offentliggørelsesdato"
-#~ msgid "Amendment Text B"
-#~ msgstr "Ændringens tekst B"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Version %s: %s"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Ændringens støtter B"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Ændringens forslagstiller B"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legals arkiv"
-#~ msgid "Amendment Text A"
-#~ msgstr "Ændringens tekst A"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG-OSS"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Ændringens støtter A"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Ændringens forslagstiller A"
+#~ msgid "DLS Index"
+#~ msgstr "DLS-indeks"
-#~ msgid "Amendment Text"
-#~ msgstr "Ændringens tekst"
+#~ msgid "License Information"
+#~ msgstr "Licensoplysninger"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Ændringens støtter"
+#~ msgid "package info"
+#~ msgstr "pakkeinfo"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Ændringens forslagstiller"
+#~ msgid "requested %s days ago."
+#~ msgstr "efterspurgt i %s dage."
-#~ msgid "Choices"
-#~ msgstr "Valgmuligheder"
+#~ msgid "requested yesterday."
+#~ msgstr "efterspurgt i går."
-#~ msgid "Proposal F"
-#~ msgstr "Forslag F"
+#~ msgid "requested today."
+#~ msgstr "efterspurgt i dag."
-#~ msgid "Proposal E"
-#~ msgstr "Forslag E"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s dage under forberedelse."
-#~ msgid "Proposal D"
-#~ msgstr "Forslag D"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "under forberedelse siden i går."
-#~ msgid "Proposal C"
-#~ msgstr "Forslag C"
+#~ msgid "in preparation since today."
+#~ msgstr "under forberedelse siden i dag."
-#~ msgid "Proposal B"
-#~ msgstr "Forslag B"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s dage under adoption."
-#~ msgid "Proposal A"
-#~ msgstr "Forslag A"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "under adoption siden i går."
-#~ msgid "Text"
-#~ msgstr "Tekst"
+#~ msgid "in adoption since today."
+#~ msgstr "under adoption siden i dag."
-#~ msgid "Opposition"
-#~ msgstr "Opposition"
+#~ msgid "No help requested"
+#~ msgstr "Ingen hjælp ønsket"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Forslags F's støtter"
+#~ msgid "No Requested packages"
+#~ msgstr "Ingen efterspurgte pakker"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Forslags E's støtter"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Ingen pakker som venter på at blive pakket"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Forslags D's støtter"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Ingen pakker som venter på at blive adopteret"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Forslags C's støtter"
+#~ msgid "No orphaned packages"
+#~ msgstr "Ingen forældreløse pakker"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Forslags B's støtter"
+#~ msgid "No requests for adoption"
+#~ msgstr "Ingen adoptionsforespørglser"
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Forslags A's støtter"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Denne udgave af Debian Weekly News blev redigeret "
+#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Seconds"
-#~ msgstr "Støtter"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Denne udgave af Debian Weekly News blev redigeret "
+#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Forslags F's forslagsstiller"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Weekly News redigeres af <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Forslags E's forslagsstiller"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Weekly News redigeres af <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Forslags D's forslagsstiller"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "For at få dette nyhedsbrev som e-mail hver uge, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Forslags C's forslagsstiller"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Tilbage til <a href=\"./\">Debians foredragsholderside</a>."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Forslags B's forslagsstiller"
+#~ msgid "List of Speakers"
+#~ msgstr "Liste med foredragsholdere"
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Forslags A's forslagsstiller"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Den blev oversat af %s."
-#~ msgid "Proposer"
-#~ msgstr "Forslagsstiller"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Den blev oversat af %s."
-#~ msgid "Platforms"
-#~ msgstr "Platforme"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Den blev oversat af %s."
-#~ msgid "Debate"
-#~ msgstr "Debat"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Den blev oversat af %s."
-#~ msgid "Nominations"
-#~ msgstr "Nomineringer"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Denne udgave af Debians projektnyheder blev "
+#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Time Line"
-#~ msgstr "Tidslinje"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Denne udgave af Debians projektnyheder blev "
+#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Date"
-#~ msgstr "Dato"
+#~ msgid ""
+#~ "<void id=\"plural\" />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>."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Engelsksproget <a href=\"/MailingLists/disclaimer\">offentlig postliste</"
-#~ "a> vedr. cd'er/dvd'er:"
+#~ "<void id=\"singular\" />Debians projektnyheder redigeres af <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "div"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "<a href=\"../../\">Tidligere udgaver</a> af nyhedsbrevet er tilgængelige."
-#~ msgid "net_install"
-#~ msgstr "netinstall"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "For at få dette nyhedsbrev som e-mail hver anden uge, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
-#~ msgid "buy"
-#~ msgstr "køb"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (dødt link)"
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Tilbage til: andre <a href=\"./\">Debian-nyheder</a> || <a href=\"m4_HOME/"
+#~ "\">Debian-projektets hjemmeside</a>."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Download calendar entry"
+#~ msgstr "Hent kalenderpost"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "oss"
+#~ msgid "Latest News"
+#~ msgstr "Seneste nyt"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian på cd"
+#~ msgid "Related Links"
+#~ msgstr "Relaterede links"
-#~ msgid "Debian CD team"
-#~ msgstr "Debians cd-team"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Aftryksoplysninger"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hovedkoordinator"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Hent med Torrent"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debians involvering"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-spejle"
+#~ msgid "More Info"
+#~ msgstr "Yderligere oplysninger"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Spejling"
+#~ msgid "Where"
+#~ msgstr "Hvor"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Kunst"
+#~ msgid "When"
+#~ msgstr "Hvornår"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Diverse"
+#~ msgid "link may no longer be valid"
+#~ msgstr "Linket kan være forældet"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Hent"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kommende begivenheder"
-#~ msgid "Network Install"
-#~ msgstr "Netværksinstallering"
+#~ msgid "More information"
+#~ msgstr "Yderligere oplysninger"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Køb cd'er eller dvd'er"
+#~ msgid "Report it!"
+#~ msgstr "Rapporter det!"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Hent via http/ftp"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Har du fundet et problem med webstedets layout?"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Hent med Jigdo"
+#~ msgid "Rating:"
+#~ msgstr "Grad:"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Nobody"
+#~ msgstr "Ingen"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tilbage til <a href=\"./\">Debians konsulentside</a>."
+#~ msgid "Taken by:"
+#~ msgstr "Overtaget af:"
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulentliste"
+#~ msgid "More information:"
+#~ msgstr "Flere oplysninger:"
-#~ msgid "Select a server near you"
-#~ msgstr "Vælg en server i nærheden af dig"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Besøg vores sponsor"
diff --git a/danish/po/vendors.da.po b/danish/po/vendors.da.po
index b8474ad5afc..1abbca1f0e6 100644
--- a/danish/po/vendors.da.po
+++ b/danish/po/vendors.da.po
@@ -63,80 +63,80 @@ msgstr "kildekode"
msgid "and"
msgstr "og"
-#~ msgid "updated monthly"
-#~ msgstr "opdateres månedligt"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "opdateres to gange om ugen"
+#~ msgid "Vendor:"
+#~ msgstr "Forhandler:"
-#~ msgid "updated weekly"
-#~ msgstr "opdateres ugentligt"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-sidens URL:"
-#~ msgid "reseller"
-#~ msgstr "forhandler"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tillader bidrag til Debian:"
-#~ msgid "reseller of $var"
-#~ msgstr "forhandler af $var"
+#~ msgid "Country:"
+#~ msgstr "Land:"
-#~ msgid "Custom Release"
-#~ msgstr "Specialfremstillet udgave"
+#~ msgid "Ship International:"
+#~ msgstr "Sender til udlandet:"
-#~ msgid "vendor additions"
-#~ msgstr "tillæg fra distributør"
+#~ msgid "email:"
+#~ msgstr "e-mail:"
-#~ msgid "contrib included"
-#~ msgstr "inkluderer contrib-delen"
+#~ msgid "CD Type:"
+#~ msgstr "CD-type:"
-#~ msgid "non-free included"
-#~ msgstr "inkluderer non-free-delen"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-type"
-#~ msgid "non-US included"
-#~ msgstr "inkluderer non-US-delen"
+#~ msgid "BD Type:"
+#~ msgstr "BD-type:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Flere distributioner"
+#~ msgid "USB Type:"
+#~ msgstr "USB-type:"
-#~ msgid "Vendor Release"
-#~ msgstr "Distributørspecifik udgave"
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
-#~ msgid "Development Snapshot"
-#~ msgstr "Udviklingsversion"
+#~ msgid "Official CD"
+#~ msgstr "Officiel cd"
#~ msgid "Official DVD"
#~ msgstr "Officiel dvd"
-#~ msgid "Official CD"
-#~ msgstr "Officiel cd"
+#~ msgid "Development Snapshot"
+#~ msgstr "Udviklingsversion"
-#~ msgid "Architectures:"
-#~ msgstr "Arkitekturer:"
+#~ msgid "Vendor Release"
+#~ msgstr "Distributørspecifik udgave"
-#~ msgid "USB Type:"
-#~ msgstr "USB-type:"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Flere distributioner"
-#~ msgid "BD Type:"
-#~ msgstr "BD-type:"
+#~ msgid "non-US included"
+#~ msgstr "inkluderer non-US-delen"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD-type"
+#~ msgid "non-free included"
+#~ msgstr "inkluderer non-free-delen"
-#~ msgid "CD Type:"
-#~ msgstr "CD-type:"
+#~ msgid "contrib included"
+#~ msgstr "inkluderer contrib-delen"
-#~ msgid "email:"
-#~ msgstr "e-mail:"
+#~ msgid "vendor additions"
+#~ msgstr "tillæg fra distributør"
-#~ msgid "Ship International:"
-#~ msgstr "Sender til udlandet:"
+#~ msgid "Custom Release"
+#~ msgstr "Specialfremstillet udgave"
-#~ msgid "Country:"
-#~ msgstr "Land:"
+#~ msgid "reseller of $var"
+#~ msgstr "forhandler af $var"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Tillader bidrag til Debian:"
+#~ msgid "reseller"
+#~ msgstr "forhandler"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Debian-sidens URL:"
+#~ msgid "updated weekly"
+#~ msgstr "opdateres ugentligt"
-#~ msgid "Vendor:"
-#~ msgstr "Forhandler:"
+#~ msgid "updated twice weekly"
+#~ msgstr "opdateres to gange om ugen"
+
+#~ msgid "updated monthly"
+#~ msgstr "opdateres månedligt"
diff --git a/dutch/po/blends.nl.po b/dutch/po/blends.nl.po
index 913c69dba21..fecfb1a1833 100644
--- a/dutch/po/blends.nl.po
+++ b/dutch/po/blends.nl.po
@@ -28,16 +28,26 @@ msgstr "Derivaten"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Debian Astro stelt zich tot doel een op Debian gebaseerd besturingssysteem "
+"te ontwikkelen dat beantwoordt aan de behoeften van zowel professionele als "
+"hobby-astronomen. Het project integreert in Debian een groot aantal "
+"softwarepakketten die betrekking hebben op telescoopbesturing, datareductie, "
+"presentatie en andere gebieden."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"DebiChem stelt zich tot doel met Debian aan chemici een goed platform te "
"bieden voor hun dagelijkse werkzaamheden."
-#: ../../english/blends/released.data:23
-#| msgid ""
-#| "The goal of Debian Games is to provide games in Debian from arcade and "
-#| "aventure to simulation and strategy."
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
@@ -45,7 +55,7 @@ msgstr ""
"Debian Games stelt zich tot doel in Debian spellen aan te bieden die gaan "
"van arcade- en avonturenspellen tot simulatie- en strategische spellen."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -53,7 +63,7 @@ msgstr ""
"Debian Edu stelt zich tot doel te voorzien in een Debian-systeem dat "
"geschikt is voor educatief gebruik in scholen."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -62,7 +72,7 @@ msgstr ""
"distributie wordt voor toepassingen voor en gebruikers van een geografisch "
"informatiesysteem."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -70,7 +80,7 @@ msgstr ""
"Debian Junior stelt zich tot doel van Debian een OS te maken dat kinderen "
"leuk vinden om te gebruiken."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -83,7 +93,7 @@ msgstr ""
"Debian vrije en open bronsoftware voor medische beeldvorming, voor bio-"
"informatica, voor klinische IT-infrastructuur, enzovoort."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -91,7 +101,7 @@ msgstr ""
"Debian Multimedia stelt zich tot doel van Debian een geschikt platform te "
"maken voor audio- en multimedia-werkzaamheden."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -111,19 +121,6 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Debian Astro stelt zich tot doel een op Debian gebaseerd besturingssysteem "
-"te ontwikkelen dat beantwoordt aan de behoeften van zowel professionele als "
-"hobby-astronomen. Het project integreert in Debian een groot aantal "
-"softwarepakketten die betrekking hebben op telescoopbesturing, datareductie, "
-"presentatie en andere gebieden."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
@@ -131,7 +128,7 @@ msgstr ""
"designers, waaronder grafische designers, webdesigners en "
"multimediadesigners."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -147,7 +144,7 @@ msgstr ""
"in verschillende streken en regio's, zoals Afrika, Afghanistan, Indonesië, "
"Vietnam."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -162,7 +159,7 @@ msgstr ""
"Tor-knooppunt op een apparaat dat een draadloze router kan vervangen en "
"waardoor de gebruikers meester blijven over hun gegevens."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -171,7 +168,7 @@ msgstr ""
"radioamateurs te beantwoorden door te voorzien in een logboek en in "
"toepassingen voor gegevensoverdracht in datamodus en pakketmodus, enzovoort."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -180,8 +177,8 @@ msgstr ""
"de behoeften van parlementariërs, politici en hun stafleden over de hele "
"wereld."
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian Accessibility"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games"
diff --git a/dutch/po/distrib.nl.po b/dutch/po/distrib.nl.po
index 7ee3b7edca2..7e2e9fb947b 100644
--- a/dutch/po/distrib.nl.po
+++ b/dutch/po/distrib.nl.po
@@ -211,23 +211,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/dutch/po/doc.nl.po b/dutch/po/doc.nl.po
index 0b1891bb297..b935718ffbe 100644
--- a/dutch/po/doc.nl.po
+++ b/dutch/po/doc.nl.po
@@ -229,13 +229,13 @@ msgstr "(versie <get-var version />)"
msgid "plain text"
msgstr "platte tekst"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> opslagplaats."
+"\"https://www.debian.org/git\">Git</a> opslagplaats."
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
@@ -263,14 +263,6 @@ msgstr ""
"De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
"\"https://packages.debian.org/subversion\">Subversion</a> opslagplaats."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
-"\"https://www.debian.org/git\">Git</a> opslagplaats."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -301,238 +293,127 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 ARM-architectuur"
-
-#~ msgid ""
-#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
-#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
-#~ "Psion5).\n"
-#~ " It also gives generic information, tools and techniques. The GNU\n"
-#~ " toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ " includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ " coming from other platforms.\n"
-#~ " It is not specific to Debian, but the Aleph\n"
-#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ " will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ " host machine too."
-#~ msgstr ""
-#~ "Dit boek is voor ontwikkelaars die werken met GNU/Linux op ARM "
-#~ "processoren.\n"
-#~ " Het behandelt enkele toestellen specifiek voor snelle configuratie "
-#~ "(LART,\n"
-#~ " Assabet, Psion5). Het geeft ook algemene informatie, hulpmiddelen en\n"
-#~ " technieken. De GNU toolchain wordt behandeld in oorspronkelijke als in\n"
-#~ " cross-compiler-vorm, evenals bootloaders, kernel-patches, RAM-"
-#~ "schijven,\n"
-#~ " ARM-eigenaardigheden en andere ARM-bronnen. Er is ook een extensieve "
-#~ "tutorial\n"
-#~ " inbegrepen over basiskennis voor GNU/Linux-ontwikkelaars die van "
-#~ "andere\n"
-#~ " platformen komen.\n"
-#~ " Het is niet specifiek voor Debian, maar de Aleph ARMLinux distributie "
-#~ "is\n"
-#~ " gebaseerd op Debian-ARM en er wordt vanuit gegaan dut u zult werken "
-#~ "vanuit\n"
-#~ " deze distributie en dat u best ook een Debian-gebaseerde host-machine "
-#~ "hebt."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Gebruik <a href=\"cvs\">SVN</a> om de SGML-broncode van de tekst van <get-"
-#~ "var ddp_pkg_loc /> te downloaden."
-
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "Een alternatieve <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publicatie</a> is beschikbaar bij Lehmanns Fachbuchhandlung en kost "
-#~ "€&nbsp;29,95;\n"
-#~ " (per 2008)"
-
-#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
-#~ msgstr ""
-#~ "Als u wilt leren om eenvoudige en complexe IT-platformen ten ontwikkelen "
-#~ "met enkel vrije software, dan is dit voor u het juiste boek. In dit boek "
-#~ "worden een groot aantal procedures besproken en aangepast op de "
-#~ "richtlijnen voor implementatie van technologische infrastructuur. Deze "
-#~ "eenvoudig te lezen en uitgebreide gids helpt u om specifieke doelen te "
-#~ "bereiken met het besturingssysteem Debian GNU/Linux."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "Sarge-CD met installatieprogramma en een selectie van pakketten"
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Dit boek bevat vier delen: Basisconcepten, Beheer van GNU/Linux, "
-#~ "geavanceerde\n"
-#~ " Systeemadministratie en Geavanceerde operaties. Elk hoofdstuk verklaard "
-#~ "diepgaand\n"
-#~ " de mogelijkheden van het besturingssysteem. In het eerste hoofdstuk "
-#~ "wordt de structuur\n"
-#~ " van GNU/Linux uitgelegd. Deze hoofdstukken zullen de lezer helpen te "
-#~ "begrijpen hoe het\n"
-#~ " systeem basismiddelen zoals de processor en het geheugen gebruikt. Een\n"
-#~ " gedetailleerde analyse over bestandssystemen zoals Ext2, Ext3, en "
-#~ "ReiserFS\n"
-#~ " zal gebruikers toelaten om de correcte keuze voor hun behoeften te "
-#~ "maken.\n"
-#~ " Vele cijfers door het boek tonen aspecten over de prestaties van het "
-#~ "systeem.\n"
-#~ " Dit boek verzorgt studenten en iedereen die GNU/Linux diepgaand wil "
-#~ "leren\n"
-#~ " kennen. Dit boek behandelt Debian Sarge."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live-CD met Knoppix"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Het eerste Perzische boek over Debian GNU/Linux. Dit boek helpt u om "
-#~ "Debian\n"
-#~ " GNU/Linux te installeren en netwerkdiensten op te zetten zoals web, "
-#~ "databank,\n"
-#~ " firewall, mail, ftp en .... Het helpt u ook om te beginnen GNU/Linux "
+#~ "Zowel beginners als gevorderde gebruikers zullen dit boek zien als een\n"
+#~ " uitgebreide bron van informatie over Debian voor desktops, intranet- "
#~ "en\n"
-#~ " Debian’s krachtige pakketbeheersysteem te gebruiken."
+#~ " internetservers en ontwikkeling. Het bevat ook achtergrondinformatie "
+#~ "over\n"
+#~ " de achtergrond van het project en een uitgebreide aandacht voor het "
+#~ "unieke\n"
+#~ " pakketbeheersysteem van Debian."
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "officiële Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386)"
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Dit boek introduceert de lezers in Debian GNU/Linux met vele praktische\n"
-#~ " uitleg en tips. Geschreven in het Koreaans, dit boek behandelt "
-#~ "veelomvattende\n"
-#~ " aspecten van het Debian GNU/Linux-systeem: instellen voor de eerste "
-#~ "keer,\n"
-#~ " pakketinstallatie, instellen van X, verbinden met het Internet,\n"
-#~ " netwerkbeheer, en meer. Dit boek biedt een handvol tips om Debian in "
+#~ "Dit boek introduceert de concepten en technieken in het Debian-"
+#~ "besturingssysteeem,\n"
+#~ " het legt hun gebruik en valkuilen uit en het illustreert de "
+#~ "gedachtegang\n"
+#~ " achter elk van de mogelijkheden. Het doel is niet om een referentieboek "
#~ "te\n"
-#~ " stellen voor de Koreaanse taalomgeving en het is ook goed voor "
-#~ "nieuwkomers."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Drie officiële potato r3-CD’s en een onofficiële woody-CD"
+#~ " zijn, maar om de lezer genoeg inzicht te geven in de werking van het "
+#~ "project\n"
+#~ " en het besturingssysteem om de gesofisticeerde en elegante, soms op "
+#~ "het\n"
+#~ " eerste zicht niet echt intuïtieve oplossingen die geëvolueerd zijn als\n"
+#~ " onderdeel van het Debian-systeem in het laatste decenium, te leren en\n"
+#~ " gebruiken. Alhoewel het gericht is op de geletterde UNIX/Linux-"
+#~ "beheerder, kan\n"
+#~ " het boek ook dienen als een excellente bron naast een standaard Linux-"
+#~ "referentie\n"
+#~ " om de Linux-ervaring in een Debian bottum-up filosofie op te doen."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Dit boek geeft een kort overzicht van de installatie van Debian GNU/"
-#~ "Linux,\n"
-#~ " fundamentele Unix- en Linux-commando’s, basisch configuratie en beheer "
-#~ "van\n"
-#~ " het systeem en netwerken, instelling van het X Window System en het "
-#~ "gebruik\n"
-#~ " van multimedia in Debian GNU/Linux.\n"
-#~ " Dit boek is ook een gids voor beheerders die mensen in Korea stimuleren "
-#~ "om\n"
-#~ " officiële Debian-beheerders te worden."
-
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "Eén onofficiële Woody, 3 Potato rev0"
+#~ "Een praktische referentiegids voor het Debian GNU/Linux-systeem dat "
+#~ "toont,\n"
+#~ " in meer dan 1,500 <q>recepten</q>, hoe het te gebruiken voor "
+#~ "alledaagse\n"
+#~ " activiteiten -- van tekstbewerking, figuren en geluid tot "
+#~ "productiviteit en\n"
+#~ " netwerkproblemen. Zoals de software het boek beschrijft, het boek is\n"
+#~ " ‘copylefted’ en haar broncode is beschikbaar."
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Dit boek behandelt algemene onderwerpen over Debian GNU/Linux: "
+#~ "Learning Debian GNU/Linux gidst de nieuwe Linux-gebruiker door de "
#~ "installatie\n"
-#~ " APT en dpkg, shell, X Window System, netwerken, systeembeheer,\n"
-#~ " kernelconfiguratie, delen met Windows, servers configureren enz.\n"
-#~ " U zult in staat zijn om Debian GNU/Linux Japanse omgeving zeer "
-#~ "gemakkelijk\n"
-#~ " te installeren en te gebruiken met de aangepaste CD’s."
+#~ " en configuratie van Debian GNU/Linux.\n"
+#~ " Windows-gebruikers zullen een geleidelijke introductie krijgen in de "
+#~ "boeiende\n"
+#~ " computerwereld aangeboden door Bill McCarty in <q>Learning Debian GNU/"
+#~ "Linux</q>."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386, eigen uitgave auteur (3 CD’s)"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Dit is het recentste boek voor Sarge in de serie aangeboden als een\n"
-#~ " standaard bijbel voor Debian in Japan.\n"
-#~ " Dit boek behandelt alle aspecten van het gebruik van Debian GNU/Linux "
-#~ "3.1\n"
-#~ " Sarge, zoals installatie, desktopomgevingen, systeembeheer en\n"
-#~ " serverconfiguratie. Verder bevat dit boek ook een commercieel\n"
-#~ " lettertype-pakket dat uw desktop decoreert. Dit boek is nuttig voor "
-#~ "alle\n"
-#~ " Debian-gebruikers van beginners tot gevorderde gebruikers."
+#~ "Bestaat uit 230+ pagina’s en drie CD-ROM’s. Softwareonderwerpen die aan "
+#~ "bod\n"
+#~ " komen zijn Debian Linux, netwerken, programmeerhulpmiddelen, GUI, "
+#~ "desktop\n"
+#~ " publishing, bedrijfssoftware, plezante dingen en multimedia. 30 dagen "
+#~ "gratis\n"
+#~ " e-mailondersteuning inbegrepen."
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, eigen uitgave auteur (DVD + CD)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD van Debian Squeeze i386/amd64"
+
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "Twee edities: Eén zonder DVD, de andere met twee DVDs (i386)"
+
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 en amd64) op DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Dit boek is in woordenboekstijl en behandelt verschillende tips voor "
-#~ "beginners\n"
-#~ " en gebruikers met een gemiddelde kunde; installatie op verschillende "
-#~ "manieren,\n"
-#~ " desktop-aanpassingen, problemen oplossen, winstgevende knowhow "
-#~ "enzovoort."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge installatieprogramma (mini-CD)"
+#~ "Twee edities: Eén zonder CD, de ander met officiële CD (i386, contrib en "
+#~ "broncode)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -571,124 +452,242 @@ msgstr "PDF"
#~ "bouwen van\n"
#~ " een inbelrouter of een server voor Windows-gebaseerde clients (Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge installatieprogramma (mini-CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "Twee edities: Eén zonder CD, de ander met officiële CD (i386, contrib en "
-#~ "broncode)"
-
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 en amd64) op DVD"
-
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "Twee edities: Eén zonder DVD, de andere met twee DVDs (i386)"
+#~ "Dit boek is in woordenboekstijl en behandelt verschillende tips voor "
+#~ "beginners\n"
+#~ " en gebruikers met een gemiddelde kunde; installatie op verschillende "
+#~ "manieren,\n"
+#~ " desktop-aanpassingen, problemen oplossen, winstgevende knowhow "
+#~ "enzovoort."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD van Debian Squeeze i386/amd64"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, eigen uitgave auteur (DVD + CD)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
#~ msgstr ""
-#~ "Bestaat uit 230+ pagina’s en drie CD-ROM’s. Softwareonderwerpen die aan "
-#~ "bod\n"
-#~ " komen zijn Debian Linux, netwerken, programmeerhulpmiddelen, GUI, "
-#~ "desktop\n"
-#~ " publishing, bedrijfssoftware, plezante dingen en multimedia. 30 dagen "
-#~ "gratis\n"
-#~ " e-mailondersteuning inbegrepen."
+#~ "Dit is het recentste boek voor Sarge in de serie aangeboden als een\n"
+#~ " standaard bijbel voor Debian in Japan.\n"
+#~ " Dit boek behandelt alle aspecten van het gebruik van Debian GNU/Linux "
+#~ "3.1\n"
+#~ " Sarge, zoals installatie, desktopomgevingen, systeembeheer en\n"
+#~ " serverconfiguratie. Verder bevat dit boek ook een commercieel\n"
+#~ " lettertype-pakket dat uw desktop decoreert. Dit boek is nuttig voor "
+#~ "alle\n"
+#~ " Debian-gebruikers van beginners tot gevorderde gebruikers."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386, eigen uitgave auteur (3 CD’s)"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Learning Debian GNU/Linux gidst de nieuwe Linux-gebruiker door de "
+#~ "Dit boek behandelt algemene onderwerpen over Debian GNU/Linux: "
#~ "installatie\n"
-#~ " en configuratie van Debian GNU/Linux.\n"
-#~ " Windows-gebruikers zullen een geleidelijke introductie krijgen in de "
-#~ "boeiende\n"
-#~ " computerwereld aangeboden door Bill McCarty in <q>Learning Debian GNU/"
-#~ "Linux</q>."
+#~ " APT en dpkg, shell, X Window System, netwerken, systeembeheer,\n"
+#~ " kernelconfiguratie, delen met Windows, servers configureren enz.\n"
+#~ " U zult in staat zijn om Debian GNU/Linux Japanse omgeving zeer "
+#~ "gemakkelijk\n"
+#~ " te installeren en te gebruiken met de aangepaste CD’s."
+
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "Eén onofficiële Woody, 3 Potato rev0"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "Een praktische referentiegids voor het Debian GNU/Linux-systeem dat "
-#~ "toont,\n"
-#~ " in meer dan 1,500 <q>recepten</q>, hoe het te gebruiken voor "
-#~ "alledaagse\n"
-#~ " activiteiten -- van tekstbewerking, figuren en geluid tot "
-#~ "productiviteit en\n"
-#~ " netwerkproblemen. Zoals de software het boek beschrijft, het boek is\n"
-#~ " ‘copylefted’ en haar broncode is beschikbaar."
+#~ "Dit boek geeft een kort overzicht van de installatie van Debian GNU/"
+#~ "Linux,\n"
+#~ " fundamentele Unix- en Linux-commando’s, basisch configuratie en beheer "
+#~ "van\n"
+#~ " het systeem en netwerken, instelling van het X Window System en het "
+#~ "gebruik\n"
+#~ " van multimedia in Debian GNU/Linux.\n"
+#~ " Dit boek is ook een gids voor beheerders die mensen in Korea stimuleren "
+#~ "om\n"
+#~ " officiële Debian-beheerders te worden."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Drie officiële potato r3-CD’s en een onofficiële woody-CD"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Dit boek introduceert de concepten en technieken in het Debian-"
-#~ "besturingssysteeem,\n"
-#~ " het legt hun gebruik en valkuilen uit en het illustreert de "
-#~ "gedachtegang\n"
-#~ " achter elk van de mogelijkheden. Het doel is niet om een referentieboek "
+#~ "Dit boek introduceert de lezers in Debian GNU/Linux met vele praktische\n"
+#~ " uitleg en tips. Geschreven in het Koreaans, dit boek behandelt "
+#~ "veelomvattende\n"
+#~ " aspecten van het Debian GNU/Linux-systeem: instellen voor de eerste "
+#~ "keer,\n"
+#~ " pakketinstallatie, instellen van X, verbinden met het Internet,\n"
+#~ " netwerkbeheer, en meer. Dit boek biedt een handvol tips om Debian in "
#~ "te\n"
-#~ " zijn, maar om de lezer genoeg inzicht te geven in de werking van het "
-#~ "project\n"
-#~ " en het besturingssysteem om de gesofisticeerde en elegante, soms op "
-#~ "het\n"
-#~ " eerste zicht niet echt intuïtieve oplossingen die geëvolueerd zijn als\n"
-#~ " onderdeel van het Debian-systeem in het laatste decenium, te leren en\n"
-#~ " gebruiken. Alhoewel het gericht is op de geletterde UNIX/Linux-"
-#~ "beheerder, kan\n"
-#~ " het boek ook dienen als een excellente bron naast een standaard Linux-"
-#~ "referentie\n"
-#~ " om de Linux-ervaring in een Debian bottum-up filosofie op te doen."
+#~ " stellen voor de Koreaanse taalomgeving en het is ook goed voor "
+#~ "nieuwkomers."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "officiële Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386)"
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Zowel beginners als gevorderde gebruikers zullen dit boek zien als een\n"
-#~ " uitgebreide bron van informatie over Debian voor desktops, intranet- "
+#~ "Het eerste Perzische boek over Debian GNU/Linux. Dit boek helpt u om "
+#~ "Debian\n"
+#~ " GNU/Linux te installeren en netwerkdiensten op te zetten zoals web, "
+#~ "databank,\n"
+#~ " firewall, mail, ftp en .... Het helpt u ook om te beginnen GNU/Linux "
#~ "en\n"
-#~ " internetservers en ontwikkeling. Het bevat ook achtergrondinformatie "
-#~ "over\n"
-#~ " de achtergrond van het project en een uitgebreide aandacht voor het "
-#~ "unieke\n"
-#~ " pakketbeheersysteem van Debian."
+#~ " Debian’s krachtige pakketbeheersysteem te gebruiken."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live-CD met Knoppix"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Dit boek bevat vier delen: Basisconcepten, Beheer van GNU/Linux, "
+#~ "geavanceerde\n"
+#~ " Systeemadministratie en Geavanceerde operaties. Elk hoofdstuk verklaard "
+#~ "diepgaand\n"
+#~ " de mogelijkheden van het besturingssysteem. In het eerste hoofdstuk "
+#~ "wordt de structuur\n"
+#~ " van GNU/Linux uitgelegd. Deze hoofdstukken zullen de lezer helpen te "
+#~ "begrijpen hoe het\n"
+#~ " systeem basismiddelen zoals de processor en het geheugen gebruikt. Een\n"
+#~ " gedetailleerde analyse over bestandssystemen zoals Ext2, Ext3, en "
+#~ "ReiserFS\n"
+#~ " zal gebruikers toelaten om de correcte keuze voor hun behoeften te "
+#~ "maken.\n"
+#~ " Vele cijfers door het boek tonen aspecten over de prestaties van het "
+#~ "systeem.\n"
+#~ " Dit boek verzorgt studenten en iedereen die GNU/Linux diepgaand wil "
+#~ "leren\n"
+#~ " kennen. Dit boek behandelt Debian Sarge."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "Sarge-CD met installatieprogramma en een selectie van pakketten"
+#~ msgid ""
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
+#~ msgstr ""
+#~ "Als u wilt leren om eenvoudige en complexe IT-platformen ten ontwikkelen "
+#~ "met enkel vrije software, dan is dit voor u het juiste boek. In dit boek "
+#~ "worden een groot aantal procedures besproken en aangepast op de "
+#~ "richtlijnen voor implementatie van technologische infrastructuur. Deze "
+#~ "eenvoudig te lezen en uitgebreide gids helpt u om specifieke doelen te "
+#~ "bereiken met het besturingssysteem Debian GNU/Linux."
+
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Een alternatieve <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publicatie</a> is beschikbaar bij Lehmanns Fachbuchhandlung en kost "
+#~ "€&nbsp;29,95;\n"
+#~ " (per 2008)"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Gebruik <a href=\"cvs\">SVN</a> om de SGML-broncode van de tekst van <get-"
+#~ "var ddp_pkg_loc /> te downloaden."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Dit boek is voor ontwikkelaars die werken met GNU/Linux op ARM "
+#~ "processoren.\n"
+#~ " Het behandelt enkele toestellen specifiek voor snelle configuratie "
+#~ "(LART,\n"
+#~ " Assabet, Psion5). Het geeft ook algemene informatie, hulpmiddelen en\n"
+#~ " technieken. De GNU toolchain wordt behandeld in oorspronkelijke als in\n"
+#~ " cross-compiler-vorm, evenals bootloaders, kernel-patches, RAM-"
+#~ "schijven,\n"
+#~ " ARM-eigenaardigheden en andere ARM-bronnen. Er is ook een extensieve "
+#~ "tutorial\n"
+#~ " inbegrepen over basiskennis voor GNU/Linux-ontwikkelaars die van "
+#~ "andere\n"
+#~ " platformen komen.\n"
+#~ " Het is niet specifiek voor Debian, maar de Aleph ARMLinux distributie "
+#~ "is\n"
+#~ " gebaseerd op Debian-ARM en er wordt vanuit gegaan dut u zult werken "
+#~ "vanuit\n"
+#~ " deze distributie en dat u best ook een Debian-gebaseerde host-machine "
+#~ "hebt."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 ARM-architectuur"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> opslagplaats."
diff --git a/dutch/po/organization.nl.po b/dutch/po/organization.nl.po
index d2450c52ed0..2babd1a3499 100644
--- a/dutch/po/organization.nl.po
+++ b/dutch/po/organization.nl.po
@@ -367,7 +367,6 @@ msgstr ""
"trademark\">handelsmerk</a>"
#: ../../english/intro/organization.data:453
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Salsa-beheerders"
@@ -400,36 +399,35 @@ msgid "Debian for science and related research"
msgstr "Debian voor wetenschappelijke toepassingen en onderzoek"
#: ../../english/intro/organization.data:492
-#| msgid "Debian for education"
msgid "Debian for astronomy"
msgstr "Debian voor de sterrenkunde"
-#~ msgid "Live System Team"
-#~ msgstr "Livesysteem-team"
-
-#~ msgid "Auditor"
-#~ msgstr "Auditor"
+#~ msgid "Testing Security Team"
+#~ msgstr "Beveiligingsteam voor Testing"
-#~ msgid "Publicity"
-#~ msgstr "Publiciteit"
+#~ msgid "Security Audit Project"
+#~ msgstr "Beveiligingsauditproject"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Beheerders van de encryptiesleutels van Debian Maintainers (DM)"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "huidige projectleider van Debian"
-#~ msgid "DebConf chairs"
-#~ msgstr "DebConf-leiding"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Niet actief: is niet uitgebracht met squeeze)"
#~ msgid "Bits from Debian"
#~ msgstr "Stukjes van Debian"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Niet actief: is niet uitgebracht met squeeze)"
+#~ msgid "DebConf chairs"
+#~ msgstr "DebConf-leiding"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "huidige projectleider van Debian"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Beheerders van de encryptiesleutels van Debian Maintainers (DM)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Beveiligingsauditproject"
+#~ msgid "Publicity"
+#~ msgstr "Publiciteit"
-#~ msgid "Testing Security Team"
-#~ msgstr "Beveiligingsteam voor Testing"
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
+
+#~ msgid "Live System Team"
+#~ msgstr "Livesysteem-team"
diff --git a/dutch/po/others.nl.po b/dutch/po/others.nl.po
index 3ab5b85ec5d..1438657819e 100644
--- a/dutch/po/others.nl.po
+++ b/dutch/po/others.nl.po
@@ -336,17 +336,17 @@ msgstr "Versie"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "Waar:"
+#~ msgid "Wanted:"
+#~ msgstr "Gevraagd:"
-#~ msgid "Specifications:"
-#~ msgstr "Specificaties:"
+#~ msgid "Who:"
+#~ msgstr "Wie:"
#~ msgid "Architecture:"
#~ msgstr "Architectuur"
-#~ msgid "Who:"
-#~ msgstr "Wie:"
+#~ msgid "Specifications:"
+#~ msgstr "Specificaties:"
-#~ msgid "Wanted:"
-#~ msgstr "Gevraagd:"
+#~ msgid "Where:"
+#~ msgstr "Waar:"
diff --git a/dutch/po/partners.nl.po b/dutch/po/partners.nl.po
index 700aac77f37..8cbd8956a80 100644
--- a/dutch/po/partners.nl.po
+++ b/dutch/po/partners.nl.po
@@ -149,8 +149,8 @@ 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> voorziet het Debian-project "
-"van hardware en hostingdiensten die via een hogesnelheidsverbinding geleverd "
+"<a href=\"http://www.dg-i.net/\">DG-i</a> voorziet het Debian-project van "
+"hardware en hostingdiensten die via een hogesnelheidsverbinding geleverd "
"worden vanaf de locaties waar hun servers bijeengeplaatst zijn. <a href="
"\"https://wiki.debian.org\">wiki.debian.org</a> ontving een IBM x360 server."
@@ -239,12 +239,12 @@ msgid ""
"works with the best of the Internet, serving 14 trillion requests each "
"month, more than 10 percent of all internet requests."
msgstr ""
-"Fastly's <q>edge computing</q>-platform voorziet in een geavanceerde en veilige "
-"beschikbaarstelling van web-applicaties voor de bedrijven achter 's werelds "
-"meest populaire internetadressen. Fastly werkt voor de besten op het "
+"Fastly's <q>edge computing</q>-platform voorziet in een geavanceerde en "
+"veilige beschikbaarstelling van web-applicaties voor de bedrijven achter 's "
+"werelds meest populaire internetadressen. Fastly werkt voor de besten op het "
"internet, waarbij elke maand 14 biljoen verzoeken worden afgehandeld, meer "
-"dan 10 procent van alle verzoeken op het internet. [<q>Edge computing</q> is een "
-"vorm van cloud computing waarbij het verwerken van data gebeurt door de "
+"dan 10 procent van alle verzoeken op het internet. [<q>Edge computing</q> is "
+"een vorm van cloud computing waarbij het verwerken van data gebeurt door de "
"server die zich het dichtst bij de bron van die data bevindt. --vertaler]"
#: ../../english/partners/partners.def:102
diff --git a/dutch/po/ports.nl.po b/dutch/po/ports.nl.po
index c96a6289897..a455a348746 100644
--- a/dutch/po/ports.nl.po
+++ b/dutch/po/ports.nl.po
@@ -120,32 +120,32 @@ msgstr "Debian voor PowerPC"
msgid "Debian for Sparc"
msgstr "Debian voor Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian voor Laptops"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian voor AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian voor Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian voor ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian voor S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian voor Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian voor MIPS"
-#~ msgid "Main"
-#~ msgstr "Hoofd"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian voor Motorola 680x0"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian voor Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Hoofd"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian voor MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian voor Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian voor S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian voor ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian voor Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian voor AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian voor Laptops"
diff --git a/dutch/po/stats.nl.po b/dutch/po/stats.nl.po
index a1d6fe2642a..d877feec44d 100644
--- a/dutch/po/stats.nl.po
+++ b/dutch/po/stats.nl.po
@@ -34,79 +34,90 @@ msgstr "Er zijn %d bytes te vertalen."
msgid "There are %d strings to translate."
msgstr "Er zijn %d strings te vertalen."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Deze vertaling is te verouderd"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Verkeerde vertalingsversie"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Deze vertaling is te verouderd"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Het origineel is nieuwer dan deze vertaling"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Het origineel bestaat niet meer"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "aantal bezoeken n.v.t"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "bezoeken"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Klik om de verschil-info op te halen"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Verenigde diff"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Gekleurde diff"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Gekleurde diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Gemaakt met <transstatslink>"
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Vertaaloverzicht voor"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Niet vertaald"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Verouderd"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Vertaald"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Bijgewerkt"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "bestanden"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -114,131 +125,131 @@ msgstr ""
"Let op: De lijst van pagina’s is gesorteerd op volgorde van populariteit. "
"Houd de muis over de paginanaam om het aantal bezoeken te zien."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Verouderde vertalingen"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Bestand"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Verschill (diff)"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Opmerking"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Verschil-info"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Logboek"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Vertaling"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Beheerder"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Vertaler"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Datum"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Algemene pagina’s die niet zijn vertaald"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Onvertaalde algemene pagina’s"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Nieuwsberichten die niet zijn vertaald"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Onvertaalde nieuwsberichten"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Consultant/gebruikerspagina’s die niet zijn vertaald"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Onvertaalde consultant/gebruikerspagina’s"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Internationale pagina’s die niet zijn vertaald"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Onvertaalde internationale pagina’s"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Vertaalde pagina’s (bijgewerkt)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Vertaalde templates (PO-bestanden)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "PO vertaalstatistieken"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Vaag (fuzzy)"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Onvertaald"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Totaal"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Totaal:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Vertaalde webpagina’s"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Vertaalstatistieken op basis van het aantal pagina’s"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Taal"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Vertalingen"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Vertaalde webpagina’s (grootte)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Vertaalstatistieken op basis van paginagrootte"
diff --git a/dutch/po/templates.nl.po b/dutch/po/templates.nl.po
index e439c9edb29..f9cd584727f 100644
--- a/dutch/po/templates.nl.po
+++ b/dutch/po/templates.nl.po
@@ -205,18 +205,19 @@ msgstr "in versie 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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>."
+#| "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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Stuur, om een probleem met de website te rapporteren, een e-mail (in het "
"Engels) naar de openbare en gearchiveerde mailinglijst <a href=\"mailto:"
@@ -518,6 +519,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>N.B.</em> Het origineel van deze vertaling bestaat niet meer."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
diff --git a/dutch/po/vendors.nl.po b/dutch/po/vendors.nl.po
index ae1baf8f74e..0a44706d3c8 100644
--- a/dutch/po/vendors.nl.po
+++ b/dutch/po/vendors.nl.po
@@ -71,29 +71,29 @@ msgstr "broncode"
msgid "and"
msgstr "en"
-#~ msgid "Architectures:"
-#~ msgstr "Architecturen:"
+#~ msgid "Vendor:"
+#~ msgstr "Verkoper:"
-#~ msgid "DVD Type:"
-#~ msgstr "Type DVD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL voor Debian-pagina:"
-#~ msgid "CD Type:"
-#~ msgstr "Type CD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Staat donatie aan Debian toe:"
-#~ msgid "email:"
-#~ msgstr "e-mail:"
+#~ msgid "Country:"
+#~ msgstr "Land:"
#~ msgid "Ship International:"
#~ msgstr "Verzendt naar het buitenland:"
-#~ msgid "Country:"
-#~ msgstr "Land:"
+#~ msgid "email:"
+#~ msgstr "e-mail:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Staat donatie aan Debian toe:"
+#~ msgid "CD Type:"
+#~ msgstr "Type CD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL voor Debian-pagina:"
+#~ msgid "DVD Type:"
+#~ msgstr "Type DVD:"
-#~ msgid "Vendor:"
-#~ msgstr "Verkoper:"
+#~ msgid "Architectures:"
+#~ msgstr "Architecturen:"
diff --git a/english/po/doc.pot b/english/po/doc.pot
index 23d4f6265f6..39789dbdce2 100644
--- a/english/po/doc.pot
+++ b/english/po/doc.pot
@@ -57,7 +57,8 @@ msgid "plain text"
msgstr ""
#: ../../english/doc/manuals.defs:154
-msgid "The latest <get-var srctype /> source is available through the <a href=\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#: ../../english/doc/manuals.defs:178
+msgid "The latest <get-var srctype /> source is available through the <a href=\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156
@@ -82,10 +83,6 @@ msgstr ""
msgid "The latest <get-var srctype /> source is available through the <a href=\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid "The latest <get-var srctype /> source is available through the <a href=\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid "CVS sources working copy: set <code>CVSROOT</code>\n to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n and check out the <kbd>boot-floppies/documentation</kbd> module."
msgstr ""
diff --git a/english/po/stats.pot b/english/po/stats.pot
index c1bb4afd8b6..8fedba5819c 100644
--- a/english/po/stats.pot
+++ b/english/po/stats.pot
@@ -3,235 +3,245 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../stattrans.pl:239
-#: ../../stattrans.pl:243
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282
+#: ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:241
-#: ../../stattrans.pl:437
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:248
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:290
+#: ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:431
-#: ../../stattrans.pl:432
+#: ../../stattrans.pl:500
+#: ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:446
-#: ../../stattrans.pl:590
-#: ../../stattrans.pl:591
+#: ../../stattrans.pl:516
+#: ../../stattrans.pl:679
+#: ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:449
-#: ../../stattrans.pl:590
-#: ../../stattrans.pl:591
+#: ../../stattrans.pl:519
+#: ../../stattrans.pl:679
+#: ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:551
-#: ../../stattrans.pl:693
+#: ../../stattrans.pl:524
+#: ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528
+#: ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639
+#: ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:559
-#: ../../stattrans.pl:641
-#: ../../stattrans.pl:715
-#: ../../stattrans.pl:761
-#: ../../stattrans.pl:804
+#: ../../stattrans.pl:647
+#: ../../stattrans.pl:733
+#: ../../stattrans.pl:807
+#: ../../stattrans.pl:853
+#: ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:559
-#: ../../stattrans.pl:716
-#: ../../stattrans.pl:762
+#: ../../stattrans.pl:647
+#: ../../stattrans.pl:808
+#: ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:559
-#: ../../stattrans.pl:717
-#: ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647
+#: ../../stattrans.pl:809
+#: ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:560
-#: ../../stattrans.pl:561
-#: ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648
+#: ../../stattrans.pl:649
+#: ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:566
-#: ../../stattrans.pl:567
-#: ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654
+#: ../../stattrans.pl:655
+#: ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid "Note: the lists of pages are sorted by popularity. Hover over the page name to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:584
-#: ../../stattrans.pl:640
+#: ../../stattrans.pl:672
+#: ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:586
-#: ../../stattrans.pl:592
+#: ../../stattrans.pl:674
+#: ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:638
-#: ../../stattrans.pl:788
+#: ../../stattrans.pl:730
+#: ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:639
-#: ../../stattrans.pl:791
+#: ../../stattrans.pl:731
+#: ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:642
-#: ../../stattrans.pl:805
+#: ../../stattrans.pl:734
+#: ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:713
-#: ../../stattrans.pl:759
-#: ../../stattrans.pl:803
+#: ../../stattrans.pl:805
+#: ../../stattrans.pl:851
+#: ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:714
-#: ../../stattrans.pl:760
+#: ../../stattrans.pl:806
+#: ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/english/po/templates.pot b/english/po/templates.pot
index 5401588beda..736ece70daa 100644
--- a/english/po/templates.pot
+++ b/english/po/templates.pot
@@ -169,7 +169,7 @@ msgstr ""
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
-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.debian.org</a> in English. For other contact information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href=\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
#: ../../english/template/debian/footer.wml:108
@@ -447,6 +447,10 @@ msgstr ""
msgid "<em>Note:</em> The original document of this translation no longer exists."
msgstr ""
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr ""
diff --git a/english/template/debian/footer.wml b/english/template/debian/footer.wml
index f4d7d3f58de..56ab9e449d1 100644
--- a/english/template/debian/footer.wml
+++ b/english/template/debian/footer.wml
@@ -102,7 +102,7 @@
# 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.
- <gettext>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>.</gettext>
+ <gettext>To report a problem with the web site, please e-mail our publicly archived mailing list <a href="mailto:debian-www@lists.debian.org">debian-www@lists.debian.org</a> in English. For other contact information, see the Debian <a href="m4_HOME/contact">contact page</a>. Web site source code is <a href="https://salsa.debian.org/webmaster-team/webwml">available</a>.</gettext>
</define-tag>
<define-tag lastmodified whitespace=delete>
<gettext>Last Modified</gettext>
diff --git a/esperanto/po/blends.eo.po b/esperanto/po/blends.eo.po
index 64b8c15bf29..b00934651af 100644
--- a/esperanto/po/blends.eo.po
+++ b/esperanto/po/blends.eo.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/esperanto/po/doc.eo.po b/esperanto/po/doc.eo.po
index 27de3a6cb17..602f75e8f6a 100644
--- a/esperanto/po/doc.eo.po
+++ b/esperanto/po/doc.eo.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -87,7 +63,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -107,6 +83,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
@@ -159,10 +151,10 @@ msgstr ""
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -187,12 +179,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
diff --git a/esperanto/po/organization.eo.po b/esperanto/po/organization.eo.po
index 26d43829fba..b196dc0991c 100644
--- a/esperanto/po/organization.eo.po
+++ b/esperanto/po/organization.eo.po
@@ -1,5 +1,13 @@
-msgid "" msgstr "" "Project-Id-Version: Debian webwml organization\n" "PO-Revision-Date: 2006-08-12 16:59+0200\n" "Last-Translator: unknown\n" "Language-Team: unknown\n"
-"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
+msgid ""
+msgstr ""
+"Project-Id-Version: Debian webwml organization\n"
+"PO-Revision-Date: 2006-08-12 16:59+0200\n"
+"Last-Translator: unknown\n"
+"Language-Team: unknown\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
#: ../../english/intro/organization.data:15
msgid "delegation mail"
@@ -63,22 +71,22 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr ""
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr ""
@@ -95,270 +103,278 @@ msgstr ""
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr ""
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr ""
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr ""
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr ""
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
"contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+msgid "Salsa administrators"
+msgstr ""
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
+
+#: ../../english/intro/organization.data:492
+msgid "Debian for astronomy"
+msgstr ""
diff --git a/esperanto/po/partners.eo.po b/esperanto/po/partners.eo.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/esperanto/po/partners.eo.po
+++ b/esperanto/po/partners.eo.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/esperanto/po/stats.eo.po b/esperanto/po/stats.eo.po
index f4846ecbba2..017e6abb1e8 100644
--- a/esperanto/po/stats.eo.po
+++ b/esperanto/po/stats.eo.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index b6a05416bf3..99853d6f5f6 100644
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -211,11 +211,11 @@ msgstr "en livero 2.2"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Se vi volas sciigi nin pri problemo en tiu ĉi retejo, bonvolu sendi "
"retpoŝtan mesaĝon en la angla al <a href=\"mailto:debian-www@lists.debian.org"
@@ -518,6 +518,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Noto:</em> La originala paĝo ne plu ekzistas."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr ""
@@ -526,163 +530,122 @@ msgstr ""
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Reen al la <a href=\"./\">paĝo pri Kiu uzas Debian</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Listo de Konsultantoj"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
-
-#~ msgid "Download with Jigdo"
-#~ msgstr "Elŝuti per Jigdo"
-
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Elŝuti per HTTP/FTP"
-
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Aĉeti KD-jn aŭ DVD-jn"
-
-#~ msgid "Network Install"
-#~ msgstr "Perreta instalado"
-
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Elŝuti"
-
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Alispeciaj"
-
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Artaĵoj"
-
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Spegulado"
-
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Viziti aŭspicianton"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Elŝuti per Torrent"
+#~ msgid "Select a server near you"
+#~ msgstr "Elektu servilon proksiman"
-#~ msgid "Debian CD team"
-#~ msgstr "Debiana teamo pri KD"
+#~ msgid "More information:"
+#~ msgstr "Pli da informo:"
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donacoj"
+#~ msgid "Taken by:"
+#~ msgstr "Prenita de"
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "proponita"
+#~ msgid "Nobody"
+#~ msgstr "Neniu"
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Diskutata"
+#~ msgid "Rating:"
+#~ msgstr "Poentoj"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
+#~ msgid "More information"
+#~ msgstr "Pli da informo"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Diskutata"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Venontaj Aferoj"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Voĉdono&nbsp;Malfermita"
+#~ msgid "link may no longer be valid"
+#~ msgstr "eble la ligo ne plu estas valida"
-#~ msgid "Decided"
-#~ msgstr "Decidita"
+#~ msgid "When"
+#~ msgstr "Kiam"
-#~ msgid "Other"
-#~ msgstr "Alia"
+#~ msgid "Where"
+#~ msgstr "Kie"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
+#~ msgid "More Info"
+#~ msgstr "Pli da informo"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kiel&nbsp;Fari"
+#~ msgid "Debian Involvement"
+#~ msgstr "Partopreno de Debiano"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Sendi&nbsp;Proponon"
+#~ msgid "Main Coordinator"
+#~ msgstr "Ĉefa Kunordiganto"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Modifi&nbsp;Proponon"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekto</th><th>Kunordiganto</th>"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Sekvi&nbsp;Proponon"
+#~ msgid "Related Links"
+#~ msgstr "Rilataj Ligoj"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Legi&nbsp;Rezulton"
+#~ msgid "Latest News"
+#~ msgstr "Lastaj Novaĵoj"
-#~ msgid "Vote"
-#~ msgstr "Voĉdono"
+#, fuzzy
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</a>."
+#, fuzzy
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "Legu la <a href=\"m4_HOME/contact\">debianan kontaktpaĝon</a> por scii "
-#~ "kiel kontakti nin."
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (malĝusta ligo)"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Koncernebla"
+#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
-#~ msgid "Fixed in"
-#~ msgstr "Solvita je"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
+#~ "haveblaj."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
-#~ msgid "discussed"
-#~ msgstr "diskutita"
-
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "neniu"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Pli da informo"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Pakoj Koncernataj"
-
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
+
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
#, fuzzy
#~ msgid ""
@@ -694,117 +657,158 @@ msgstr "Reen al la <a href=\"./\">paĝo pri Kiu uzas Debian</a>."
#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
-#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
-#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
-
-#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
+#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "Pakoj Koncernataj"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Pli da informo"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "neniu"
+
+#~ msgid "discussed"
+#~ msgstr "diskutita"
+
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
-#~ "haveblaj."
+#~ msgid "Fixed in"
+#~ msgstr "Solvita je"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Koncernebla"
+
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (malĝusta ligo)"
-#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
-#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
-#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
+#~ "Legu la <a href=\"m4_HOME/contact\">debianan kontaktpaĝon</a> por scii "
+#~ "kiel kontakti nin."
-#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</a>."
+#~ msgid "Vote"
+#~ msgstr "Voĉdono"
-#~ msgid "Latest News"
-#~ msgstr "Lastaj Novaĵoj"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Legi&nbsp;Rezulton"
-#~ msgid "Related Links"
-#~ msgstr "Rilataj Ligoj"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sekvi&nbsp;Proponon"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekto</th><th>Kunordiganto</th>"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Modifi&nbsp;Proponon"
-#~ msgid "Main Coordinator"
-#~ msgstr "Ĉefa Kunordiganto"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sendi&nbsp;Proponon"
-#~ msgid "Debian Involvement"
-#~ msgstr "Partopreno de Debiano"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kiel&nbsp;Fari"
-#~ msgid "More Info"
-#~ msgstr "Pli da informo"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
-#~ msgid "Where"
-#~ msgstr "Kie"
+#~ msgid "Other"
+#~ msgstr "Alia"
-#~ msgid "When"
-#~ msgstr "Kiam"
+#~ msgid "Decided"
+#~ msgstr "Decidita"
-#~ msgid "link may no longer be valid"
-#~ msgstr "eble la ligo ne plu estas valida"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Voĉdono&nbsp;Malfermita"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Venontaj Aferoj"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Diskutata"
-#~ msgid "More information"
-#~ msgstr "Pli da informo"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
-#~ msgid "Rating:"
-#~ msgstr "Poentoj"
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Diskutata"
-#~ msgid "Nobody"
-#~ msgstr "Neniu"
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "proponita"
-#~ msgid "Taken by:"
-#~ msgstr "Prenita de"
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donacoj"
-#~ msgid "More information:"
-#~ msgstr "Pli da informo:"
+#~ msgid "Debian CD team"
+#~ msgstr "Debiana teamo pri KD"
-#~ msgid "Select a server near you"
-#~ msgstr "Elektu servilon proksiman"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Elŝuti per Torrent"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Viziti aŭspicianton"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
+
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Spegulado"
+
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Artaĵoj"
+
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Alispeciaj"
+
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Elŝuti"
+
+#~ msgid "Network Install"
+#~ msgstr "Perreta instalado"
+
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Aĉeti KD-jn aŭ DVD-jn"
+
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Elŝuti per HTTP/FTP"
+
+#~ msgid "Download with Jigdo"
+#~ msgstr "Elŝuti per Jigdo"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Listo de Konsultantoj"
diff --git a/finnish/po/blends.fi.po b/finnish/po/blends.fi.po
index 58576d66642..ebf39cc3025 100644
--- a/finnish/po/blends.fi.po
+++ b/finnish/po/blends.fi.po
@@ -23,13 +23,25 @@ msgstr "Johdannaiset"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Debian-Astron tavoite on kehittää Debian-pohjainen käyttöjärjestelmä, joka "
+"sopii sekä ammattimaisten että harrastelija-astronomien vaatimuksiin. Se "
+"integroi suuren määrän ohjelmistopaketteja kattaen teleskooppien ohjaamisen, "
+"datan vähentämisen, esittämisen ja muut alat."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"DebiChecmin tavoite on tehdä Debianista hyvä alusta kemisteille heidän "
"päivittäisessä työssään."
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
#, fuzzy
#| msgid ""
#| "The goal of Debian Games is to provide games in Debian from arcade and "
@@ -40,7 +52,7 @@ msgid ""
msgstr ""
"Debian-pelien tavoite on tarjota pelejä Debianille kaikista peligenreistä."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -48,7 +60,7 @@ msgstr ""
"Debian-Edun tavoite on tarjota Debian-käyttöjärjestelmä, joka soveltuu "
"opetus- ja koulukäyttöön."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -56,7 +68,7 @@ msgstr ""
"Debian-GIS:n tavoite on kehittää Debian parhaaksi jakeluksi geografisille "
"informaationjärjestelmäsovelluksille ja niiden käyttäjille."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -64,7 +76,7 @@ msgstr ""
"Debian-Juniorin tavoite on tehdä Debianista käyttöjärjestelmä, jonka "
"käyttämisestä lapset nauttivat."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -77,7 +89,7 @@ msgstr ""
"bioinformatiikkaan ja klinikoiden IT-infrastruktuuriin ja muut liittyvät "
"vapaat ja avoimen lähdekoodin ohjelmistot Debian-käyttöjärjestelmään."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -85,7 +97,7 @@ msgstr ""
"Debian-Multimedian tavoite on tehdä Debianista hyvä alusta ääni- ja "
"multimediatyöskentelyyn."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -104,25 +116,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Debian-Astron tavoite on kehittää Debian-pohjainen käyttöjärjestelmä, joka "
-"sopii sekä ammattimaisten että harrastelija-astronomien vaatimuksiin. Se "
-"integroi suuren määrän ohjelmistopaketteja kattaen teleskooppien ohjaamisen, "
-"datan vähentämisen, esittämisen ja muut alat."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Debian-Designin tavoite on tarjota sovelluksia suunnittelijoille. Tämä "
"sisältää graafisen suunnittelun, web-suunnittelun ja multimediasuunnittelun."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -137,7 +137,7 @@ msgstr ""
"kuten Afrikassa, Afganistanissa, Indonesiassa ja Vietamissa Debiania "
"käyttäen."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -152,7 +152,7 @@ msgstr ""
"solmu laitteessa, joka voi korvata langattoman reitittimen siten, että "
"tiedot säilyvät käyttäjillä."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -160,7 +160,7 @@ msgstr ""
"Debian-Hamradion tavoite on tukea radioamatöörien tarpeita Debianissa "
"tarjoamalla lokitusta, datamoodin ja pakettimoodin sovelluksia ja muita."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -168,8 +168,8 @@ msgstr ""
"DebianParl:n tavoite on tarjota sovelluksia tukemaan parlamentaarikkojen, "
"poliitikkojen ja heidän väkensä tarpeisiin ympäri maailman."
-#~ msgid "Debian Games"
-#~ msgstr "Debian-pelit"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian-Esteettömyys"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian-pelit"
diff --git a/finnish/po/bugs.fi.po b/finnish/po/bugs.fi.po
index baadc9c9c1a..52069a0c2d0 100644
--- a/finnish/po/bugs.fi.po
+++ b/finnish/po/bugs.fi.po
@@ -155,155 +155,155 @@ msgstr "arkistoidut"
msgid "Archived and Unarchived"
msgstr "arkistoidut sekä arkistoimattomat"
-#~ msgid "Flags:"
-#~ msgstr "Liput:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Älä sisällytä määrettä: "
-#~ msgid "active bugs"
-#~ msgstr "aktiiviset viat"
+#~ msgid "Include tag:"
+#~ msgstr "Sisällytä määre: "
-#~ msgid "display merged bugs only once"
-#~ msgstr "näytä yhdistetyt viat vain kerran"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ei järjestystä tilan tai vakavuuden perusteella"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "ei sisällysluetteloa yläotsakkeeseen"
+#~ msgid "wontfix"
+#~ msgstr "ei korjata"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "ei yhteenvetoa alaotsakkeeseen"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "proposed-updates"
-#~ msgstr "ehdotetut päivitykset"
+#~ msgid "unreproducible"
+#~ msgstr "ei toistettavissa"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testattava - ehdotetut päivitykset"
+#~ msgid "security"
+#~ msgstr "tietoturva"
-#~ msgid "Package version:"
-#~ msgstr "Paketin versio:"
+#~ msgid "patch"
+#~ msgstr "paikkaus"
-#~ msgid "Distribution:"
-#~ msgstr "Jakelu:"
+#~ msgid "moreinfo"
+#~ msgstr "lisätietoja"
-#~ msgid "bugs"
-#~ msgstr "viat"
+#~ msgid "l10n"
+#~ msgstr "lokalisointi"
-#~ msgid "open"
-#~ msgstr "avoin"
+#~ msgid "help"
+#~ msgstr "apua"
-#~ msgid "forwarded"
-#~ msgstr "siirretty eteenpäin"
+#~ msgid "fixed-upstream"
+#~ msgstr "korjattu-upstream"
-#~ msgid "pending"
-#~ msgstr "ratkaisematon"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "korjattu-experimentalissa"
-#~ msgid "fixed"
-#~ msgstr "korjattu"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "done"
-#~ msgstr "valmis"
+#~ msgid "confirmed"
+#~ msgstr "vahvistettu"
-#~ msgid "Include status:"
-#~ msgstr "Sisällytä tila: "
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "Exclude status:"
-#~ msgstr "Älä sisällytä tilaa: "
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-älävälitä"
-#~ msgid "critical"
-#~ msgstr "kriittinen"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "grave"
-#~ msgstr "haudanvakava"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-älävälitä"
-#~ msgid "serious"
-#~ msgstr "vakava"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "important"
-#~ msgstr "tärkeä"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-älävälitä"
-#~ msgid "minor"
-#~ msgstr "vähäpätöinen"
+#~ msgid "sarge"
+#~ msgstr "sarge"
-#~ msgid "wishlist"
-#~ msgstr "toive"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Sisällytä vakavuus: "
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Älä sisällytä vakavuutta: "
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Sisällytä vakavuus: "
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "toive"
-#~ msgid "sarge"
-#~ msgstr "sarge"
+#~ msgid "minor"
+#~ msgstr "vähäpätöinen"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-älävälitä"
+#~ msgid "important"
+#~ msgstr "tärkeä"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "serious"
+#~ msgstr "vakava"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-älävälitä"
+#~ msgid "grave"
+#~ msgstr "haudanvakava"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "critical"
+#~ msgstr "kriittinen"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-älävälitä"
+#~ msgid "Exclude status:"
+#~ msgstr "Älä sisällytä tilaa: "
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Include status:"
+#~ msgstr "Sisällytä tila: "
-#~ msgid "confirmed"
-#~ msgstr "vahvistettu"
+#~ msgid "done"
+#~ msgstr "valmis"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "fixed"
+#~ msgstr "korjattu"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "korjattu-experimentalissa"
+#~ msgid "pending"
+#~ msgstr "ratkaisematon"
-#~ msgid "fixed-upstream"
-#~ msgstr "korjattu-upstream"
+#~ msgid "forwarded"
+#~ msgstr "siirretty eteenpäin"
-#~ msgid "help"
-#~ msgstr "apua"
+#~ msgid "open"
+#~ msgstr "avoin"
-#~ msgid "l10n"
-#~ msgstr "lokalisointi"
+#~ msgid "bugs"
+#~ msgstr "viat"
-#~ msgid "moreinfo"
-#~ msgstr "lisätietoja"
+#~ msgid "Distribution:"
+#~ msgstr "Jakelu:"
-#~ msgid "patch"
-#~ msgstr "paikkaus"
+#~ msgid "Package version:"
+#~ msgstr "Paketin versio:"
-#~ msgid "security"
-#~ msgstr "tietoturva"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testattava - ehdotetut päivitykset"
-#~ msgid "unreproducible"
-#~ msgstr "ei toistettavissa"
+#~ msgid "proposed-updates"
+#~ msgstr "ehdotetut päivitykset"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "ei yhteenvetoa alaotsakkeeseen"
-#~ msgid "wontfix"
-#~ msgstr "ei korjata"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "ei sisällysluetteloa yläotsakkeeseen"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ei järjestystä tilan tai vakavuuden perusteella"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "display merged bugs only once"
+#~ msgstr "näytä yhdistetyt viat vain kerran"
-#~ msgid "Include tag:"
-#~ msgstr "Sisällytä määre: "
+#~ msgid "active bugs"
+#~ msgstr "aktiiviset viat"
-#~ msgid "Exclude tag:"
-#~ msgstr "Älä sisällytä määrettä: "
+#~ msgid "Flags:"
+#~ msgstr "Liput:"
diff --git a/finnish/po/countries.fi.po b/finnish/po/countries.fi.po
index c744cc4f181..c6d9ff39e57 100644
--- a/finnish/po/countries.fi.po
+++ b/finnish/po/countries.fi.po
@@ -425,8 +425,8 @@ msgstr "Etelä-Afrikka"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoslavia"
-
#~ msgid "Great Britain"
#~ msgstr "Iso-Britannia"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavia"
diff --git a/finnish/po/distrib.fi.po b/finnish/po/distrib.fi.po
index c2b5a62e841..06fc75eae8a 100644
--- a/finnish/po/distrib.fi.po
+++ b/finnish/po/distrib.fi.po
@@ -200,53 +200,53 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "Search case sensitive"
-#~ msgstr "Kirjainkoosta riippumaton haku"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Salli haku myös sanan osista"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "yes"
-#~ msgstr "kyllä"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "no"
-#~ msgstr "ei"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Case sensitive"
-#~ msgstr "Kirjainkoosta riippuva haku"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paketit joista löytyy tämän nimisiä tiedostoja tai hakemistoja"
#~ msgid "all files in this package"
#~ msgstr "kaikki tämän paketin tiedostot"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "paketit joista löytyy tämän nimisiä tiedostoja tai hakemistoja"
+#~ msgid "Case sensitive"
+#~ msgstr "Kirjainkoosta riippuva haku"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "no"
+#~ msgstr "ei"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "yes"
+#~ msgstr "kyllä"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Salli haku myös sanan osista"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "Search case sensitive"
+#~ msgstr "Kirjainkoosta riippumaton haku"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
diff --git a/finnish/po/doc.fi.po b/finnish/po/doc.fi.po
index 4d450a5dbfb..1ca975ed88f 100644
--- a/finnish/po/doc.fi.po
+++ b/finnish/po/doc.fi.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -57,42 +57,7 @@ msgstr ""
" asentamisen ja ylläpidon perusteita (kotona, töissä, yhdistyksissä tai\n"
" koulussa)."
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 ARM-arkkitehtuurille"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-"Tämä kirja on suunnattu kehittäjille, ketkä työskentelevät\n"
-" GNU/Linuxin ja ARM-suorittimien parissa. Kirja sisältää tarkasti\n"
-" joidenkin laitteiden pika-pystytyksen (LART, Assabet, Psion5). Kirja\n"
-" antaa myös yleistä tietoa, työkaluja ja tekniikoita. GNU-työkalusarja\n"
-" käsitellään natiivissa ja ristikäännös-ympäristöissä samoin kuin\n"
-" käynnistyslataimet, ytimen pätsit, RAM-levyt, ARMin erikoispiirteet ja\n"
-" muut ARM-resurssit. Kirjassa on myös laaja tutoriaali GNU/Linuxin\n"
-" perusteisiin kehittäjille, jotka siirtyvät muilta alustoilta.\n"
-" Kirja ei ole Debian-spesifinen, mutta Aleph ARMLinux -jakelu on pohjautuu\n"
-" vahvasti Debian-ARMiin ja oletettavasti työskentelet tässä jakelussa\n"
-" ja hyvällä lykyllä Debian-pohjaisella isäntäkoneella myös."
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -114,7 +79,7 @@ msgstr ""
" Debian-työkalujen käyttötaitojen kehittämiseen sekä ylläpitäjiä, jotka\n"
" haluavat rakentaa luotettavan verkon Debianin varaan."
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -126,7 +91,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -134,6 +99,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Tekijä:"
@@ -186,13 +167,13 @@ msgstr "(versio <get-var version />)"
msgid "plain text"
msgstr "teksti"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"Tuorein <get-var srctype />-lähdekoodi on saatavilla <a href=\"https://www."
-"debian.org/doc/cvs\">Subversion</a>-versiovarastosta."
+"Tuorein <get-var srctype />-lähdekoodi on saatavilla <a href=\"https://"
+"packages.debian.org/git\">Git</a>-versiovarastosta."
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
@@ -220,14 +201,6 @@ msgstr ""
"Tuorein <get-var srctype />-lähdekoodi on saatavilla <a href=\"https://"
"packages.debian.org/subversion\">Subversion</a>-versiovarastosta."
-#: ../../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 ""
-"Tuorein <get-var srctype />-lähdekoodi on saatavilla <a href=\"https://"
-"packages.debian.org/git\">Git</a>-versiovarastosta."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -259,167 +232,114 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Language:"
-#~ msgstr "Kieli:"
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "Sarge-CD asennusohjelman kera ja valikoitu pakettilajitelma"
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Hae SGML-lähdeteksti <get-var ddp_pkg_loc />-paketille <a href=\"cvs"
-#~ "\">SVN</a>:llä."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Knoppix-live-CD"
#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Vaihtoehtoinen <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " julkaisu</a> on saatavilla Lehmannin kirjakaupasta ja hintaa sillä on\n"
-#~ " 29,95&nbsp;&euro; (vuonna 2008)."
+#~ "Tämä kirja on kattava tietolähde aloittelijoille ja edistyneemmillekin\n"
+#~ " käyttäjille Debianin käytöstä työasemissa, intranet- ja\n"
+#~ " internet-palvelimissa ja kehitysalustana. Kirja sisältää myös "
+#~ "taustatietoja\n"
+#~ " Debian-projektista ja laajan katsauksen Debianin ainutlaatuiseen\n"
+#~ " paketinhallintajärjestelmään."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Tämä kirja on jaettu neljään osaan: peruskäsitteet, GNU/Linuxin\n"
-#~ " hallinta, järjestelmän hallinta ja edistyneempi järjestelmäylläpito.\n"
-#~ " Jokainen kappale selittää syvällisesti käyttöjärjestelmän "
-#~ "ominaisuudet.\n"
-#~ " Ensimmäiset kappaleet selittävät GNU/Linuxin rakenteen. Nämä kappleet\n"
-#~ " auttavat lukijaa ymmärtämään kuinka järjestelmä käyttää perusresursseja "
-#~ "kuten\n"
-#~ " suoritinta ja muistia. Tarkempi analyysi tiedostojärjestelmistä\n"
-#~ " (Ext2, Ext3 ja ReiserFS) johtaa käyttäjät tekemään oikeita valintoja\n"
-#~ " tarpeisiinsa. Useat kuvat läpi kirjan näyttävät järjestelmän\n"
-#~ " suorituskykyä. Tämä kirja sopii alemman asteen opiskelijoille sekä\n"
-#~ " jokaiselle, joka haluaa oppia GNU/Linuxin syvällisesti. Tämä kirja\n"
-#~ " käsittelee Debian Sargea."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "virallinen Debian GNU/Linux 3.1r0a \"sarge\" -DVD (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Ensimmäinen persiankielinen kirja Debian GNU/Linuxista. Tämä kirja\n"
-#~ " auttaa Debian GNU/Linuxin asennuksessa ja verkkopalvelujen\n"
-#~ " pystytyksessä kuten www, tietokanta, palomuuri, sähköposti, ftp\n"
-#~ " jne.... Tämä auttaa myös GNU/Linuxin käytön aloittamisessa sekä\n"
-#~ " alkuunpääsemisessä Debianin tehokkaaseen\n"
-#~ " paketinhallintajärjestelmässä."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Tämä kirja esittelee Debian-käyttöjärjestelmän käsitteistöt ja "
+#~ "tekniikat,\n"
+#~ " selvittäen niiden käyttöä ja mahdollisia sudenkuoppia, ja "
+#~ "havainnollistaa\n"
+#~ " kunkin lähestymistavan ajatusmallin. Teoksen tavoitteena ei ole toimia\n"
+#~ " hakuteoksena, vaan tarjota lukijalleen riittävän syvä katsaus projektin "
+#~ "ja\n"
+#~ " käyttöjärjestelmän sisimpään jotta tämä oppii ja omaksuu hienostuneet "
+#~ "ja\n"
+#~ " elegantit, toisinaan aluksi hiukan vaikeasti ymmärrettävät,\n"
+#~ " Debian-järjestelmän osaksi viime vuosikymmenen aikana kehittyneet "
+#~ "ratkaisut.\n"
+#~ " Vaikkakin kirja on suunnattu hyvin asioihin perehtyneelle\n"
+#~ " UNIX/Linux-ylläpitäjälle, se toimii myös erinomaisena resurssina\n"
+#~ " Linuxin perusteita käsittelevän kirjallisuuden rinnalla\n"
+#~ " kartutettaessa Linux-kokemuksia Debianin filosofian mukaisesti."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Tämä kirja esittelee lukijalleen Debian GNU/Linuxin monien\n"
-#~ " käytännönläheisten tutoriaalien ja vihjeiden avulla. Koreaksi\n"
-#~ " kirjoitettuna tämä kirja sisältää täydelliset ohjeet Debian GNU/Linux\n"
-#~ " -järjestelmään alkaen ensikertalaisen asetuksista, pakettien\n"
-#~ " valinnasta, X-ikkunoinnin asetuksista, Internet-yhteyden\n"
-#~ " muodostamisesta, verkkojen ylläpitoon sun muuhun. Kirja tarjoaa\n"
-#~ " käteviä vihjeitä koreankielisen ympäristön pystyttämiseen\n"
-#~ " Debian-järjestelmään ja on hyvä uusille Debian-käyttäjille."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Kolme virallista v2.2r3 romppua ja epävirallinen woodyn romppu"
+#~ "Käytännöllinen hakuteos Debian GNU/Linux -järjestelmään, sisältää\n"
+#~ " yli 1&nbsp;500 <q>reseptiä</q>, kuinka käytät jokapäiväisissä "
+#~ "tekemisissäsi\n"
+#~ " -- tekstin, kuvien ja äänen käsittelystä tuottavuuteen ja\n"
+#~ " verkkoasioihin. Samoin kuin ohjelmisto josta kirja kertoo on kirjakin\n"
+#~ " copyleft-lisensoitu ja saatavissa lähdetietojen muodossa."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Tämä esittelee suppeasti Debian GNU/Linuxin asennuksen, Unix ja Linux\n"
-#~ " komentojen perusteet, perus konfiguroinnin, järjestelmän ylläpidon,\n"
-#~ " verkkotoiminnot, X Window Systemin asennus ja\n"
-#~ " multimedian käytön Debian GNU/Linuxissa koreaksi.\n"
-#~ " Tämä kirja sisältää\n"
-#~ " myöskin ylläpitäjän oppaan, joka houkuttelee ihmisiä Koreasta\n"
-#~ " osallistumaan Debianin kehittämiseen."
+#~ "Learning Debian GNU/Linux ohjaa uuden Linux-käyttäjän läpi Debian\n"
+#~ " GNU/Linuxin asennuksen ja asetusten.\n"
+#~ " Windows-käyttäjät löytävät mukavan johdatuksen tähän\n"
+#~ " jännittävään tietokoneiden maailman oppaanaan Bill McCartyn\n"
+#~ " <q>Learning Debian GNU/Linux</q>."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 epävirallinen Woody, 3 Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Tämä kirja käsittelee yleisiä asioita Debian GNU/Linuxista: Asennus,\n"
-#~ " APT ja DPKG, komentotulkki (shell), X Window System, palvelimien\n"
-#~ " rakennus ynnä muuta.\n"
-#~ " Voit asentaa ja ottaa käyttöön Debian GNU/Linuxin japanilaisessa\n"
-#~ " ympäristössä helposti kustomoitujen CD:iden avulla."
+#~ "Sisältää yli 230 sivua ja kolme romppua. Aiheet sisältävät Debian\n"
+#~ " Linuxin mukana tulevia ohjelmia, verkottamista, ohjelmointityökaluja,\n"
+#~ " graafisen käyttöliittymän, työpöytäjulkaisun, liikeasiat, hupijuttuja\n"
+#~ " ja multimediaa. 30 päivän ilmainen sähköpostituki sisältyy pakettiin."
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Tämä Sargea käsittelevä kirja on viimeisin sarjassa, josta on "
-#~ "muodostunut\n"
-#~ " vakiintunut <q>Debian-raamattu</q> Japanissa. Kirjassa käydään läpi "
-#~ "Debian\n"
-#~ " GNU/Linux 3.1 Sargen käyttöä monipuolisesti, kuten asennusta,\n"
-#~ " työpöytäympäristöjä, järjestelmänhallintaa ja palvelimen "
-#~ "konfigurointia.\n"
-#~ " Lisäksi kirjan mukana tulee kaupallinen kirjasinpaketti jolla voit "
-#~ "koristaa\n"
-#~ " työpöytääsi. Kirja soveltunee kaikille Debian-käyttäjille "
-#~ "aloittelijoista\n"
-#~ " aina edistyneempiin käyttäjiin."
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, kirjoittajan versio (DVD + CD)"
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 versiota: Yksi ilman DVD:tä ja toinen kahdella DVD:llä (i386)"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Tässä sanastotyyppisessä kirjassa käsitellään erinäisiä aloittelijoille\n"
-#~ " ja kokeneemmille käyttäjille suunnattuja vinkkejä; eri asennustavat,\n"
-#~ " työpöydän mukautus, ongelmanratkaisu, tietotaidon hyödyntäminen jne."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge -asennuslevy (yksi CD)"
+#~ "2 versiota: Yksi ilman romppua ja toinen sisältäen Virallisen rompun "
+#~ "(i386, contrib ja lähdekoodit)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -451,111 +371,206 @@ msgstr "PDF"
#~ " asioilla kuten soittosarjareitittimen tai tiedostopalvelimen\n"
#~ " windows-pohjaisille asiakkaille (Samba) suunnittelu ja pystyttäminen."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge -asennuslevy (yksi CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "2 versiota: Yksi ilman romppua ja toinen sisältäen Virallisen rompun "
-#~ "(i386, contrib ja lähdekoodit)"
+#~ "Tässä sanastotyyppisessä kirjassa käsitellään erinäisiä aloittelijoille\n"
+#~ " ja kokeneemmille käyttäjille suunnattuja vinkkejä; eri asennustavat,\n"
+#~ " työpöydän mukautus, ongelmanratkaisu, tietotaidon hyödyntäminen jne."
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 versiota: Yksi ilman DVD:tä ja toinen kahdella DVD:llä (i386)"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, kirjoittajan versio (DVD + CD)"
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Tämä Sargea käsittelevä kirja on viimeisin sarjassa, josta on "
+#~ "muodostunut\n"
+#~ " vakiintunut <q>Debian-raamattu</q> Japanissa. Kirjassa käydään läpi "
+#~ "Debian\n"
+#~ " GNU/Linux 3.1 Sargen käyttöä monipuolisesti, kuten asennusta,\n"
+#~ " työpöytäympäristöjä, järjestelmänhallintaa ja palvelimen "
+#~ "konfigurointia.\n"
+#~ " Lisäksi kirjan mukana tulee kaupallinen kirjasinpaketti jolla voit "
+#~ "koristaa\n"
+#~ " työpöytääsi. Kirja soveltunee kaikille Debian-käyttäjille "
+#~ "aloittelijoista\n"
+#~ " aina edistyneempiin käyttäjiin."
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Sisältää yli 230 sivua ja kolme romppua. Aiheet sisältävät Debian\n"
-#~ " Linuxin mukana tulevia ohjelmia, verkottamista, ohjelmointityökaluja,\n"
-#~ " graafisen käyttöliittymän, työpöytäjulkaisun, liikeasiat, hupijuttuja\n"
-#~ " ja multimediaa. 30 päivän ilmainen sähköpostituki sisältyy pakettiin."
+#~ "Tämä kirja käsittelee yleisiä asioita Debian GNU/Linuxista: Asennus,\n"
+#~ " APT ja DPKG, komentotulkki (shell), X Window System, palvelimien\n"
+#~ " rakennus ynnä muuta.\n"
+#~ " Voit asentaa ja ottaa käyttöön Debian GNU/Linuxin japanilaisessa\n"
+#~ " ympäristössä helposti kustomoitujen CD:iden avulla."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 epävirallinen Woody, 3 Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "Learning Debian GNU/Linux ohjaa uuden Linux-käyttäjän läpi Debian\n"
-#~ " GNU/Linuxin asennuksen ja asetusten.\n"
-#~ " Windows-käyttäjät löytävät mukavan johdatuksen tähän\n"
-#~ " jännittävään tietokoneiden maailman oppaanaan Bill McCartyn\n"
-#~ " <q>Learning Debian GNU/Linux</q>."
+#~ "Tämä esittelee suppeasti Debian GNU/Linuxin asennuksen, Unix ja Linux\n"
+#~ " komentojen perusteet, perus konfiguroinnin, järjestelmän ylläpidon,\n"
+#~ " verkkotoiminnot, X Window Systemin asennus ja\n"
+#~ " multimedian käytön Debian GNU/Linuxissa koreaksi.\n"
+#~ " Tämä kirja sisältää\n"
+#~ " myöskin ylläpitäjän oppaan, joka houkuttelee ihmisiä Koreasta\n"
+#~ " osallistumaan Debianin kehittämiseen."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Kolme virallista v2.2r3 romppua ja epävirallinen woodyn romppu"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Käytännöllinen hakuteos Debian GNU/Linux -järjestelmään, sisältää\n"
-#~ " yli 1&nbsp;500 <q>reseptiä</q>, kuinka käytät jokapäiväisissä "
-#~ "tekemisissäsi\n"
-#~ " -- tekstin, kuvien ja äänen käsittelystä tuottavuuteen ja\n"
-#~ " verkkoasioihin. Samoin kuin ohjelmisto josta kirja kertoo on kirjakin\n"
-#~ " copyleft-lisensoitu ja saatavissa lähdetietojen muodossa."
+#~ "Tämä kirja esittelee lukijalleen Debian GNU/Linuxin monien\n"
+#~ " käytännönläheisten tutoriaalien ja vihjeiden avulla. Koreaksi\n"
+#~ " kirjoitettuna tämä kirja sisältää täydelliset ohjeet Debian GNU/Linux\n"
+#~ " -järjestelmään alkaen ensikertalaisen asetuksista, pakettien\n"
+#~ " valinnasta, X-ikkunoinnin asetuksista, Internet-yhteyden\n"
+#~ " muodostamisesta, verkkojen ylläpitoon sun muuhun. Kirja tarjoaa\n"
+#~ " käteviä vihjeitä koreankielisen ympäristön pystyttämiseen\n"
+#~ " Debian-järjestelmään ja on hyvä uusille Debian-käyttäjille."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Tämä kirja esittelee Debian-käyttöjärjestelmän käsitteistöt ja "
-#~ "tekniikat,\n"
-#~ " selvittäen niiden käyttöä ja mahdollisia sudenkuoppia, ja "
-#~ "havainnollistaa\n"
-#~ " kunkin lähestymistavan ajatusmallin. Teoksen tavoitteena ei ole toimia\n"
-#~ " hakuteoksena, vaan tarjota lukijalleen riittävän syvä katsaus projektin "
-#~ "ja\n"
-#~ " käyttöjärjestelmän sisimpään jotta tämä oppii ja omaksuu hienostuneet "
-#~ "ja\n"
-#~ " elegantit, toisinaan aluksi hiukan vaikeasti ymmärrettävät,\n"
-#~ " Debian-järjestelmän osaksi viime vuosikymmenen aikana kehittyneet "
-#~ "ratkaisut.\n"
-#~ " Vaikkakin kirja on suunnattu hyvin asioihin perehtyneelle\n"
-#~ " UNIX/Linux-ylläpitäjälle, se toimii myös erinomaisena resurssina\n"
-#~ " Linuxin perusteita käsittelevän kirjallisuuden rinnalla\n"
-#~ " kartutettaessa Linux-kokemuksia Debianin filosofian mukaisesti."
+#~ "Ensimmäinen persiankielinen kirja Debian GNU/Linuxista. Tämä kirja\n"
+#~ " auttaa Debian GNU/Linuxin asennuksessa ja verkkopalvelujen\n"
+#~ " pystytyksessä kuten www, tietokanta, palomuuri, sähköposti, ftp\n"
+#~ " jne.... Tämä auttaa myös GNU/Linuxin käytön aloittamisessa sekä\n"
+#~ " alkuunpääsemisessä Debianin tehokkaaseen\n"
+#~ " paketinhallintajärjestelmässä."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "virallinen Debian GNU/Linux 3.1r0a \"sarge\" -DVD (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Tämä kirja on jaettu neljään osaan: peruskäsitteet, GNU/Linuxin\n"
+#~ " hallinta, järjestelmän hallinta ja edistyneempi järjestelmäylläpito.\n"
+#~ " Jokainen kappale selittää syvällisesti käyttöjärjestelmän "
+#~ "ominaisuudet.\n"
+#~ " Ensimmäiset kappaleet selittävät GNU/Linuxin rakenteen. Nämä kappleet\n"
+#~ " auttavat lukijaa ymmärtämään kuinka järjestelmä käyttää perusresursseja "
+#~ "kuten\n"
+#~ " suoritinta ja muistia. Tarkempi analyysi tiedostojärjestelmistä\n"
+#~ " (Ext2, Ext3 ja ReiserFS) johtaa käyttäjät tekemään oikeita valintoja\n"
+#~ " tarpeisiinsa. Useat kuvat läpi kirjan näyttävät järjestelmän\n"
+#~ " suorituskykyä. Tämä kirja sopii alemman asteen opiskelijoille sekä\n"
+#~ " jokaiselle, joka haluaa oppia GNU/Linuxin syvällisesti. Tämä kirja\n"
+#~ " käsittelee Debian Sargea."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
#~ msgstr ""
-#~ "Tämä kirja on kattava tietolähde aloittelijoille ja edistyneemmillekin\n"
-#~ " käyttäjille Debianin käytöstä työasemissa, intranet- ja\n"
-#~ " internet-palvelimissa ja kehitysalustana. Kirja sisältää myös "
-#~ "taustatietoja\n"
-#~ " Debian-projektista ja laajan katsauksen Debianin ainutlaatuiseen\n"
-#~ " paketinhallintajärjestelmään."
+#~ "Vaihtoehtoinen <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " julkaisu</a> on saatavilla Lehmannin kirjakaupasta ja hintaa sillä on\n"
+#~ " 29,95&nbsp;&euro; (vuonna 2008)."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Knoppix-live-CD"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Hae SGML-lähdeteksti <get-var ddp_pkg_loc />-paketille <a href=\"cvs"
+#~ "\">SVN</a>:llä."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "Sarge-CD asennusohjelman kera ja valikoitu pakettilajitelma"
+#~ msgid "Language:"
+#~ msgstr "Kieli:"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Tuorein <get-var srctype />-lähdekoodi on saatavilla <a href=\"https://"
+#~ "www.debian.org/doc/cvs\">Subversion</a>-versiovarastosta."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Tämä kirja on suunnattu kehittäjille, ketkä työskentelevät\n"
+#~ " GNU/Linuxin ja ARM-suorittimien parissa. Kirja sisältää tarkasti\n"
+#~ " joidenkin laitteiden pika-pystytyksen (LART, Assabet, Psion5). Kirja\n"
+#~ " antaa myös yleistä tietoa, työkaluja ja tekniikoita. GNU-työkalusarja\n"
+#~ " käsitellään natiivissa ja ristikäännös-ympäristöissä samoin kuin\n"
+#~ " käynnistyslataimet, ytimen pätsit, RAM-levyt, ARMin erikoispiirteet ja\n"
+#~ " muut ARM-resurssit. Kirjassa on myös laaja tutoriaali GNU/Linuxin\n"
+#~ " perusteisiin kehittäjille, jotka siirtyvät muilta alustoilta.\n"
+#~ " Kirja ei ole Debian-spesifinen, mutta Aleph ARMLinux -jakelu on "
+#~ "pohjautuu\n"
+#~ " vahvasti Debian-ARMiin ja oletettavasti työskentelet tässä jakelussa\n"
+#~ " ja hyvällä lykyllä Debian-pohjaisella isäntäkoneella myös."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 ARM-arkkitehtuurille"
diff --git a/finnish/po/l10n.fi.po b/finnish/po/l10n.fi.po
index b70eae8f474..b22cd1c672d 100644
--- a/finnish/po/l10n.fi.po
+++ b/finnish/po/l10n.fi.po
@@ -95,8 +95,8 @@ msgstr "POT-tiedostot"
msgid "Hints for translators"
msgstr "Vinkkejä kääntäjille"
-#~ msgid "Original templates"
-#~ msgstr "Alkuperäiset mallit"
-
#~ msgid "Translated templates"
#~ msgstr "Käännetyt mallit"
+
+#~ msgid "Original templates"
+#~ msgstr "Alkuperäiset mallit"
diff --git a/finnish/po/mailinglists.fi.po b/finnish/po/mailinglists.fi.po
index ce951e434af..fb27ad9073a 100644
--- a/finnish/po/mailinglists.fi.po
+++ b/finnish/po/mailinglists.fi.po
@@ -128,8 +128,8 @@ msgstr "avoin"
msgid "closed"
msgstr "suljettu"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Valitse listat joille haluat liittyä:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Valitse listat joilta haluat pois:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Valitse listat joille haluat liittyä:"
diff --git a/finnish/po/organization.fi.po b/finnish/po/organization.fi.po
index f529dc60e85..498ac0d701b 100644
--- a/finnish/po/organization.fi.po
+++ b/finnish/po/organization.fi.po
@@ -71,24 +71,24 @@ msgid "Officers"
msgstr "Virkailijat"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Jakelu"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Julkisuus"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Tuki ja infrastruktuuri"
@@ -105,215 +105,215 @@ msgstr "Päällikkö"
msgid "Technical Committee"
msgstr "Tekninen komitea"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "sihteeri"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Kehitysprojektit"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP-arkistot"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP-hallinto"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP-avustajat"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Takaisinsiirrokset"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Takaisinsiirrosryhmä"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Yksittäiset paketit"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Versiohallinto"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Julkaisuryhmä"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Laadunvalvonta"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Käynnistyslevykkeet"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Julkistusmuistio"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD-raakakopiot"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Tuotanto"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testaus"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Automattikääntäjien infrastruktuuri"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Wanna-build-ryhmä"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Buildd-ylläpito"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentointi"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "WNPP-luettelo"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Live System -ryhmä"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Siirrokset"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Erityisvaatimusprojektit"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Kannettavat"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Palomuurit"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Sulautetut järjestelmät"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Lehdistösihteeri"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "WWW-sivusto"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet-Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Debian Women -projekti"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Tapahtumat"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Tekninen komitea"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Kumppaniohjelma"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Laitteistolahjoitusten koordinointi"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Käyttäjätuki"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Vianhallintajärjestelmä"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Postituslistojen hallinto ja arkistointi"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Uusien ylläpitäjien vastaanotto"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debian-käyttäjätunnuksien hallinta"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Avainrenkaan ylläpitäjät (PGP ja GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Tietoturvatiimi"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Konsulttisivut"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "CD-jälleenmyyjien sivut"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Linja"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Järjestelmäylläpito"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -322,7 +322,7 @@ msgstr ""
"kanssa tulee ongelmia esimerkiksi salasanojen kanssa, tai jos sinun pitää "
"saada asennettua ohjelmapaketti."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -332,104 +332,121 @@ msgstr ""
"debian.org/machines.cgi\">Debianin koneet</a> -sivu, siellä pitäisi olla "
"kunkin koneen ylläpitäjän yhteystiedot."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP-kehittäjähakemiston ylläpito"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Ohjelmistopeilaukset"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Nimipalveluvastaavat"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Pakettiseurantajärjestelmä"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Tilintarkastaja"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth-ylläpitäjät"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth-ylläpitäjät"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian lapsille (1-99 v)"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian terveydenhuollossa"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian oppilaitoksille"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian lakitoimistoille"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian toimintarajoitteisille henkilöille"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian terveydenhuollossa"
-#~ msgid "Publicity"
-#~ msgstr "Julkisuus"
-
+#: ../../english/intro/organization.data:492
#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian-ylläpitäjien avainrengastiimi"
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian oppilaitoksille"
-#~ msgid "Volatile Team"
-#~ msgstr "Volatile-ryhmä"
+#~ msgid "Testing Security Team"
+#~ msgstr "Testattavan tietoturvatiimi"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Ei aktiivinen: ei julkaistu squeezen kanssa)"
+#~ msgid "Security Audit Project"
+#~ msgstr "Tietoturvatarkistus-projekti"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Mukautetut Debian-jakelut"
+#~ msgid "Vendors"
+#~ msgstr "Jälleenmyyjät"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Julkaisuryhmä \"vakaalle\""
+#~ msgid "Handhelds"
+#~ msgstr "Kämmenlaitteet"
-#~ msgid "Accountant"
-#~ msgstr "Kirjanpitäjä"
+#~ msgid "Marketing Team"
+#~ msgstr "Markkinointiryhmä"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Kansainvälinen käyttöjärjestelmä pöytämikrossasi"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Avainten allekirjoituskoordinointi"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian voittoa tavoittelemattomille järjestöille"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Kunkin arkkitehtuurin buildd-ylläpitäjät löytyvät osoitteesta "
+#~ "<genericemail arch@buildd.debian.org>, esim. <genericemail i386@buildd."
+#~ "debian.org>."
-#~ msgid "APT Team"
-#~ msgstr "APT-työryhmä"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Jokaisen buildd:n ylläpitäjän nimi löytyy myös sivustolta <a href="
+#~ "\"http://www.buildd.net\">http://www.buildd.net</a>. Valitsemalla "
+#~ "arkkitehtuurin ja jakelun näet käytössä olevat buildd:t ja niiden "
+#~ "ylläpitäjät."
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux yritysjärjestelmiin"
+#~ msgid "Release Assistants"
+#~ msgstr "Versioavustajat"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Asennusjärjestelmä \"vakaalle\""
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Versioavustajat \"vakaalle\""
-#~ msgid "Internal Projects"
-#~ msgstr "Sisäiset projektit"
+#~ msgid "Release Wizard"
+#~ msgstr "Versiojohtajat"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postilista-arkistot"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian-multimediajakelu"
#~ msgid ""
#~ "This is not yet an official Debian internal project but it has announced "
@@ -438,51 +455,52 @@ msgstr "Debian terveydenhuollossa"
#~ "Tämä ei ole vielä virallinen Debianin sisäinen projekti, mutta on "
#~ "ilmoittanut aikomuksensa integrointiin."
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian-multimediajakelu"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postilista-arkistot"
-#~ msgid "Release Wizard"
-#~ msgstr "Versiojohtajat"
+#~ msgid "Internal Projects"
+#~ msgstr "Sisäiset projektit"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Versioavustajat \"vakaalle\""
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Asennusjärjestelmä \"vakaalle\""
-#~ msgid "Release Assistants"
-#~ msgstr "Versioavustajat"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux yritysjärjestelmiin"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Jokaisen buildd:n ylläpitäjän nimi löytyy myös sivustolta <a href="
-#~ "\"http://www.buildd.net\">http://www.buildd.net</a>. Valitsemalla "
-#~ "arkkitehtuurin ja jakelun näet käytössä olevat buildd:t ja niiden "
-#~ "ylläpitäjät."
+#~ msgid "APT Team"
+#~ msgstr "APT-työryhmä"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Kunkin arkkitehtuurin buildd-ylläpitäjät löytyvät osoitteesta "
-#~ "<genericemail arch@buildd.debian.org>, esim. <genericemail i386@buildd."
-#~ "debian.org>."
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian voittoa tavoittelemattomille järjestöille"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Avainten allekirjoituskoordinointi"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Kansainvälinen käyttöjärjestelmä pöytämikrossasi"
-#~ msgid "Marketing Team"
-#~ msgstr "Markkinointiryhmä"
+#~ msgid "Accountant"
+#~ msgstr "Kirjanpitäjä"
-#~ msgid "Handhelds"
-#~ msgstr "Kämmenlaitteet"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Julkaisuryhmä \"vakaalle\""
-#~ msgid "Vendors"
-#~ msgstr "Jälleenmyyjät"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Mukautetut Debian-jakelut"
-#~ msgid "Security Audit Project"
-#~ msgstr "Tietoturvatarkistus-projekti"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Ei aktiivinen: ei julkaistu squeezen kanssa)"
-#~ msgid "Testing Security Team"
-#~ msgstr "Testattavan tietoturvatiimi"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatile-ryhmä"
+
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian-ylläpitäjien avainrengastiimi"
+
+#~ msgid "Publicity"
+#~ msgstr "Julkisuus"
+
+#~ msgid "Auditor"
+#~ msgstr "Tilintarkastaja"
+
+#~ msgid "Live System Team"
+#~ msgstr "Live System -ryhmä"
diff --git a/finnish/po/others.fi.po b/finnish/po/others.fi.po
index 6217b39c84b..f00b72a8375 100644
--- a/finnish/po/others.fi.po
+++ b/finnish/po/others.fi.po
@@ -326,69 +326,93 @@ msgstr "Versio"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Nimi:"
+#~ msgid "Wanted:"
+#~ msgstr "Hinnat:"
-#~ msgid "Company:"
-#~ msgstr "Yritys:"
+#~ msgid "Who:"
+#~ msgstr "Kuka:"
-#~ msgid "URL:"
-#~ msgstr "WWW-sivut:"
+#~ msgid "Architecture:"
+#~ msgstr "Arkkitehtuuri:"
-#~ msgid "or"
-#~ msgstr "tai"
+#~ msgid "Specifications:"
+#~ msgstr "Tiedot:"
-#~ msgid "Email:"
-#~ msgstr "Sähköposti:"
+#~ msgid "Where:"
+#~ msgstr "Missä:"
-#~ msgid "Rates:"
-#~ msgstr "Hinnat:"
+#~ msgid "p<get-var page />"
+#~ msgstr "s. <get-var page />"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Valmis muuttamaan"
+#~ msgid "Previous Talks:"
+#~ msgstr "Aiemmat puheet:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "Listattu yhteensä <total_consultant> Debian-konsulttia <total_country> "
-#~ "maassa maailmanlaajuisesti."
+#~ msgid "Languages:"
+#~ msgstr "Kielet:"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Postilistoille liittyminen"
+#~ msgid "Location:"
+#~ msgstr "Sijainti:"
+
+#~ msgid "Topics:"
+#~ msgstr "Aiheet:"
+
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
+
+#~ msgid "rc2"
+#~ msgstr "rc2"
+
+#~ msgid "rc3"
+#~ msgstr "rc3"
+
+#~ msgid "rc3 (broken)"
+#~ msgstr "rc3 (rikki)"
+
+#~ msgid "closed"
+#~ msgstr "suljettu"
+
+#~ msgid "open"
+#~ msgstr "avoin"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Poistu"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Valitse listat joilta haluat pois:"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
-#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka liityt "
-#~ "sähköpostitse. Listoilta voi <a href=\"unsubscribe\">poistua täyttämällä "
+#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka poistut "
+#~ "sähköpostitse. Listoille voi <a href=\"subscribe\">liittyä täyttämällä "
#~ "www-lomakkeen</a>. "
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Postilistoilta poistuminen"
+
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Huomaa, että useimmat Debianin postilistoista ovat julkisia foorumeita. "
-#~ "Kaikki niille lähetetyt sähköpostit julkaistaan julkisessa postilista-"
-#~ "arkistossa ja hakukoneet indeksoivat ne. Liittyessäsi Debianin "
-#~ "postilistoille käytä vain sellaista sähköpostiosoitetta jonka "
-#~ "julkaisemisen hyväksyt."
+#~ "Muistathan noudattaa <a href=\"./#ads\">Debianin postilistojen "
+#~ "mainostuslinjausta</a>."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Valitse listat joille haluat liittyä:"
+#~ msgid "Clear"
+#~ msgstr "Tyhjennä"
-#~ msgid "No description given"
-#~ msgstr "Kuvausta ei annettu"
+#~ msgid "Subscribe"
+#~ msgstr "Liity"
-#~ msgid "Moderated:"
-#~ msgstr "Moderoitu:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Sähköpostiosoitteesi:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Viestien lähettäminen sallittu vain listalle liittyneille."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "on ainoastaan luettavaksi, kokoelmaversio."
+
+#~ msgid "Subscription:"
+#~ msgstr "Liittyminen:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -396,90 +420,66 @@ msgstr "URL"
#~ "Ainoastaan Debian-kehittäjän allekirjoittamat viestit hyväksytään "
#~ "listalle."
-#~ msgid "Subscription:"
-#~ msgstr "Liittyminen:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "on ainoastaan luettavaksi, kokoelmaversio."
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Viestien lähettäminen sallittu vain listalle liittyneille."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Sähköpostiosoitteesi:"
+#~ msgid "Moderated:"
+#~ msgstr "Moderoitu:"
-#~ msgid "Subscribe"
-#~ msgstr "Liity"
+#~ msgid "No description given"
+#~ msgstr "Kuvausta ei annettu"
-#~ msgid "Clear"
-#~ msgstr "Tyhjennä"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Valitse listat joille haluat liittyä:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "Muistathan noudattaa <a href=\"./#ads\">Debianin postilistojen "
-#~ "mainostuslinjausta</a>."
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Postilistoilta poistuminen"
+#~ "Huomaa, että useimmat Debianin postilistoista ovat julkisia foorumeita. "
+#~ "Kaikki niille lähetetyt sähköpostit julkaistaan julkisessa postilista-"
+#~ "arkistossa ja hakukoneet indeksoivat ne. Liittyessäsi Debianin "
+#~ "postilistoille käytä vain sellaista sähköpostiosoitetta jonka "
+#~ "julkaisemisen hyväksyt."
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
-#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka poistut "
-#~ "sähköpostitse. Listoille voi <a href=\"subscribe\">liittyä täyttämällä "
+#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka liityt "
+#~ "sähköpostitse. Listoilta voi <a href=\"unsubscribe\">poistua täyttämällä "
#~ "www-lomakkeen</a>. "
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Valitse listat joilta haluat pois:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Poistu"
-
-#~ msgid "open"
-#~ msgstr "avoin"
-
-#~ msgid "closed"
-#~ msgstr "suljettu"
-
-#~ msgid "rc3 (broken)"
-#~ msgstr "rc3 (rikki)"
-
-#~ msgid "rc3"
-#~ msgstr "rc3"
-
-#~ msgid "rc2"
-#~ msgstr "rc2"
-
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
-
-#~ msgid "Topics:"
-#~ msgstr "Aiheet:"
-
-#~ msgid "Location:"
-#~ msgstr "Sijainti:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postilistoille liittyminen"
-#~ msgid "Languages:"
-#~ msgstr "Kielet:"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "Listattu yhteensä <total_consultant> Debian-konsulttia <total_country> "
+#~ "maassa maailmanlaajuisesti."
-#~ msgid "Previous Talks:"
-#~ msgstr "Aiemmat puheet:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Valmis muuttamaan"
-#~ msgid "p<get-var page />"
-#~ msgstr "s. <get-var page />"
+#~ msgid "Rates:"
+#~ msgstr "Hinnat:"
-#~ msgid "Where:"
-#~ msgstr "Missä:"
+#~ msgid "Email:"
+#~ msgstr "Sähköposti:"
-#~ msgid "Specifications:"
-#~ msgstr "Tiedot:"
+#~ msgid "or"
+#~ msgstr "tai"
-#~ msgid "Architecture:"
-#~ msgstr "Arkkitehtuuri:"
+#~ msgid "URL:"
+#~ msgstr "WWW-sivut:"
-#~ msgid "Who:"
-#~ msgstr "Kuka:"
+#~ msgid "Company:"
+#~ msgstr "Yritys:"
-#~ msgid "Wanted:"
-#~ msgstr "Hinnat:"
+#~ msgid "Name:"
+#~ msgstr "Nimi:"
diff --git a/finnish/po/partners.fi.po b/finnish/po/partners.fi.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/finnish/po/partners.fi.po
+++ b/finnish/po/partners.fi.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/finnish/po/ports.fi.po b/finnish/po/ports.fi.po
index f4aa5f3b3a5..87a027dd25b 100644
--- a/finnish/po/ports.fi.po
+++ b/finnish/po/ports.fi.po
@@ -113,65 +113,75 @@ msgstr "Debian PowerPC:lle"
msgid "Debian for Sparc"
msgstr "Debian Sparcille"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian kannettaviin"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "libc5-pohjainen Debian GNU/FreeBSD"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64:lle"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64:lle"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARMille"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390:lle"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian Beowulfiin"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPSille"
-#~ msgid "Main"
-#~ msgstr "Pääsivu"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD-ohjain, Compact Flash, UART, rinnakkaisportti, RTC, "
+#~ "näppäimistö, USB, Touchpad, äänipiiri"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr ""
+#~ "Mips 16, Compact Flash, UART, rinnakkaisportti, RTC, äänipiiri, PCIC"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0:lle"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, näppäimistö, TouchPanel, äänipiiri, Compact-Flash, UART, "
+#~ "rinnakkaisportti"
-#~ msgid "Vendor/Name"
-#~ msgstr "Toimittaja/Nimi"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Date announced"
-#~ msgstr "Julkaistu"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256k sisäinen L2-välimuisti"
-#~ msgid "Clock"
-#~ msgstr "Kellotaajuus"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bittinen ulkoinen väylä, ulkoinen L2-välimuisti"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bittinen ulkoinen väylä"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bittinen ulkoinen väylä"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr ""
+#~ "2&#215; 10/100 Ethernet, 4&#215; UART, IrDA, AC'97, I2C, 38&#215; Digital "
+#~ "I/O"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, DMAC, PCIC, UART, ajastin"
-#~ msgid "Specials"
-#~ msgstr "Erikoisuudet"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, IrDA"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Ei FPU:ta (R2010), ulkoinen välimuisti"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, LCD-ohjain, IrDA"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Ei FPU:ta (R3010)"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, ajastin, PCMCIA, LCD-ohjain, IrDA"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Virtuaalinen indeksoitu L1-välimuisti, L2-välimuistin ohjain"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, PCIC, UART, ajastin"
-#~ msgid "External L1 cache"
-#~ msgstr "Ulkoinen L1-välimuisti"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "monipiirisuoritin"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin, I2C, LCD-ohjain"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -180,72 +190,62 @@ msgstr "Debian Sparcille"
#~ "Mips16 isa-laajennus, ei FPU:ta, 512k flash, 16k ram, DMAC, UART, "
#~ "ajastin, I2C, Watchdog"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin, I2C, LCD-ohjain"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "monipiirisuoritin"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin"
+#~ msgid "External L1 cache"
+#~ msgstr "Ulkoinen L1-välimuisti"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, PCIC, UART, ajastin"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Virtuaalinen indeksoitu L1-välimuisti, L2-välimuistin ohjain"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, ajastin, PCMCIA, LCD-ohjain, IrDA"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Ei FPU:ta (R3010)"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, LCD-ohjain, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Ei FPU:ta (R2010), ulkoinen välimuisti"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, IrDA"
+#~ msgid "Specials"
+#~ msgstr "Erikoisuudet"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, DMAC, PCIC, UART, ajastin"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr ""
-#~ "2&#215; 10/100 Ethernet, 4&#215; UART, IrDA, AC'97, I2C, 38&#215; Digital "
-#~ "I/O"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bittinen ulkoinen väylä"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bittinen ulkoinen väylä"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bittinen ulkoinen väylä, ulkoinen L2-välimuisti"
+#~ msgid "Clock"
+#~ msgstr "Kellotaajuus"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256k sisäinen L2-välimuisti"
+#~ msgid "Date announced"
+#~ msgstr "Julkaistu"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Vendor/Name"
+#~ msgstr "Toimittaja/Nimi"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, näppäimistö, TouchPanel, äänipiiri, Compact-Flash, UART, "
-#~ "rinnakkaisportti"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0:lle"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr ""
-#~ "Mips 16, Compact Flash, UART, rinnakkaisportti, RTC, äänipiiri, PCIC"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD-ohjain, Compact Flash, UART, rinnakkaisportti, RTC, "
-#~ "näppäimistö, USB, Touchpad, äänipiiri"
+#~ msgid "Main"
+#~ msgstr "Pääsivu"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPSille"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian Beowulfiin"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390:lle"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARMille"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64:lle"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64:lle"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "libc5-pohjainen Debian GNU/FreeBSD"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian kannettaviin"
diff --git a/finnish/po/stats.fi.po b/finnish/po/stats.fi.po
index 4a84d78cb7a..2442bd4a12a 100644
--- a/finnish/po/stats.fi.po
+++ b/finnish/po/stats.fi.po
@@ -25,79 +25,90 @@ msgstr "Yhteensä %d tavua käännettävänä."
msgid "There are %d strings to translate."
msgstr "Yhteensä %d merkkijonoa käännettävänä."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Tämä käännös on vanhentunut"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Väärä käännösversio"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Tämä käännös on vanhentunut"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Alkuperäinen on uudempi kuin tämä käännös"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Alkuperäistä sivua ei enää ole olemassa"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "osumalukua ei saatavilla"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "osumaa"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Napsauta noutaaksesi muutostilastojen datan"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Unifoidut muutokset"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Väritetyt muutokset"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Väritetyt muutokset"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Käännösyhteenveto"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Ei käännetty"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Vanhentunut"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Käännetty"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Ajan tasalla"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "tiedostoa"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "tavua"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -105,136 +116,136 @@ msgstr ""
"Huom: sivuluettelot on lajiteltu suosion mukaan. Pidä osoitin sivun nimen "
"päällä nähdäksesi osumien lukumäärän."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Vanhetuneet käännökset"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Tiedosto"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Muutokset"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Kommentti"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Muutostilastot"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Loki"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Käännös"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Ylläpitäjä"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Tila"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Kääntäjä"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Päiväys"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Kääntämättömät yleissivut"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Kääntämättömät yleissivut"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Kääntämättömät uutiset"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Kääntämättömät uutiset"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Kääntämättömät konsultti/käyttäjäsivut"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Kääntämättömät konsultti/käyttäjäsivut"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Kääntämättömät kansainväliset sivut"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Kääntämättömät kansainväliset sivut"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Käännetyt sivut (ajan tasalla)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Käännetyt mallinteet (PO-tiedostot)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "PO-käännöstilastot"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Sumea"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Kääntämättä"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Yhteensä"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Yhteensä:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Käännetyt www-sivut"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Käännöstilastot sivumäärän mukaan"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Kieli"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Käännökset"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Käännetyt www-sivut (koon mukaan)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Käännöstilastot sivukoon mukaan"
-#~ msgid "Created with"
-#~ msgstr "Luotu työkalulla"
-
#~ msgid "Origin"
#~ msgstr "Alkuperäinen"
+
+#~ msgid "Created with"
+#~ msgstr "Luotu työkalulla"
diff --git a/finnish/po/templates.fi.po b/finnish/po/templates.fi.po
index b1ffbbaa674..6136bb2b302 100644
--- a/finnish/po/templates.fi.po
+++ b/finnish/po/templates.fi.po
@@ -201,11 +201,11 @@ msgstr "versiossa 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Ilmoitukset www-sivustolla ilmenevästä ongelmasta voi lähettää (englanniksi) "
"osoitteeseen <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -502,6 +502,10 @@ msgid ""
msgstr ""
"<em>Huomaa:</em> Alkuperäistä sivua, josta tämä on käännetty, ei enää ole."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -510,510 +514,510 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Takaisin <a href=\"../\">Ketkä käyttävät Debiania?-sivulle</a>."
-#~ msgid "Select a server near you"
-#~ msgstr "Valitse läheinen palvelin"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Vierailethan sivuston sponsorilla"
-#~ msgid "More information:"
-#~ msgstr "Lisätietoa:"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulttilista"
-#~ msgid "Taken by:"
-#~ msgstr "Ottanut:"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Takaisin <a href=\"./\">Debian-konsulttisivulle</a>."
-#~ msgid "Nobody"
-#~ msgstr "Ei kukaan"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Rating:"
-#~ msgstr "Aste:"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Lataa jigdolla"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Oletko havainnut ongelman sivuston ulkoasussa?"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Lataa http/ftp:llä"
-#~ msgid "Report it!"
-#~ msgstr "Ilmoita siitä!"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Osta CD:t/DVD:t"
-#~ msgid "More information"
-#~ msgstr "Lisätietoa"
+#~ msgid "Network Install"
+#~ msgstr "Verkkoasennus"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Tulevia tapahtumia"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Lataa verkosta"
-#~ msgid "link may no longer be valid"
-#~ msgstr "linkki voi olla vanhentunut"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Sekalaista"
-#~ msgid "When"
-#~ msgstr "Milloin"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Kansikuvia"
-#~ msgid "Where"
-#~ msgstr "Missä"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Peilaukset"
-#~ msgid "More Info"
-#~ msgstr "Lisätietoa"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-peilit"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debianin osallisuus"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Lataa torrentilla"
-#~ msgid "Main Coordinator"
-#~ msgstr "Pääkoordinoija"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Vedosten julkaisutiedotteet"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekti</th><th>Koordinaattori</th>"
+#~ msgid "Debian CD team"
+#~ msgstr "Debian-CD-ryhmä"
-#~ msgid "Related Links"
-#~ msgstr "Aiheeseen liittyviä linkkejä"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian cd:llä"
-#~ msgid "Latest News"
-#~ msgstr "Tuoreimmat uutiset"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />vukk"
-#~ msgid "Download calendar entry"
-#~ msgstr "Imuroi kalenterimerkintä"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Takaisin: muihin <a href=\"./\">Debian-uutisiin</a> || <a href=\"m4_HOME/"
-#~ "\">Debian-projektin kotisivulle</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http/ftp"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (poistettu osoite)"
+#~ msgid "buy"
+#~ msgstr "osta"
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Saadaksesi tämän uutiskirjeen joka toinen viikko postilaatikkoosi, <a "
-#~ "href=\"https://lists.debian.org/debian-news/\">liity debian-news-"
-#~ "postilistalle</a>."
+#~ msgid "net_install"
+#~ msgstr "verkkoasennus"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Uutiskirjeen <a href=\"../../\">vanhoja numeroita</a> on myös saatavilla."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />sekalaista"
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Debianin projektikatsausta toimittaa <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ "Englanninkielinen <a href=\"/MailingLists/disclaimer\">julkinen "
+#~ "postilista</a> CD/DVD:ille:"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin projektikatsausta toimittavat <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Date"
+#~ msgstr "Päiväys"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Tämän Debianin projektikatsauksen toimitti <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Aikajana"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Tämän Debianin projektikatsauksen toimittivat <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Nimeämiset"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsi %s."
+#~ msgid "Proposer"
+#~ msgstr "Ehdottaja"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsivät %s."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Ehdotuksen A ehdottaja"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsi %s."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Ehdotuksen B ehdottaja"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsivät %s."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Ehdotuksen C ehdottaja"
-#~ msgid "List of Speakers"
-#~ msgstr "Lista puhujista"
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Ehdotuksen D ehdottaja"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Takaisin <a href=\"./\">Debian-puhujasivulle</a>."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Ehdotuksen E ehdottaja"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Saadaksesi tämän uutiskirjeen viikottain postilaatikkoosi, <a href="
-#~ "\"https://lists.debian.org/debian-news/\">liity debian-news-"
-#~ "postilistalle</a>."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Ehdotuksen F ehdottaja"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ msgid "Seconds"
+#~ msgstr "Kannatukset"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a>."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Ehdotuksen A kannattajat"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Ehdotuksen B kannattajat"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a>."
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Ehdotuksen C kannattajat"
-#~ msgid "No requests for adoption"
-#~ msgstr "Ei adoptointipyyntöjä"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Ehdotuksen D kannattajat"
-#~ msgid "No orphaned packages"
-#~ msgstr "Ei orpoja paketteja"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Ehdotuksen E kannattajat"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Ei paketteja odottamassa adoptiota"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Ehdotuksen F kannattajat"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Ei paketteja odottamassa paketointia"
+#~ msgid "Opposition"
+#~ msgstr "Vastustus"
-#~ msgid "No Requested packages"
-#~ msgstr "Ei pyydettyjä paketteja"
+#~ msgid "Text"
+#~ msgstr "Teksti"
-#~ msgid "No help requested"
-#~ msgstr "Ei pyydetty apua"
+#~ msgid "Proposal A"
+#~ msgstr "Ehdotus A"
-#~ msgid "in adoption since today."
-#~ msgstr "adoptiossa tästä päivästä lähtien."
+#~ msgid "Proposal B"
+#~ msgstr "Ehdotus B"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "adoptiossa eilisestä lähtien."
+#~ msgid "Proposal C"
+#~ msgstr "Ehdotus C"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s päivää adoptiossa."
+#~ msgid "Proposal D"
+#~ msgstr "Ehdotus D"
-#~ msgid "in preparation since today."
-#~ msgstr "valmistelussa tästä päivästä lähtien."
+#~ msgid "Proposal E"
+#~ msgstr "Ehdotus E"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "valmistelussa eilisestä lähtien."
+#~ msgid "Proposal F"
+#~ msgstr "Ehdotus F"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s päivää valmistelussa."
+#~ msgid "Choices"
+#~ msgstr "Vaihtoehdot"
-#~ msgid "requested today."
-#~ msgstr "pyydetty tänään."
+#~ msgid "Majority Requirement"
+#~ msgstr "Enemmistövaatimus"
-#~ msgid "requested yesterday."
-#~ msgstr "pyydetty eilen."
+#~ msgid "Outcome"
+#~ msgstr "Tulos"
-#~ msgid "requested %s days ago."
-#~ msgstr "pyydetty %s päivää sitten."
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Kannatusta odottavat"
-#~ msgid "package info"
-#~ msgstr "pakettitietoa"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Keskusteltavana"
-#~ msgid "License Information"
-#~ msgstr "Lisenssitiedot"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Äänestys&nbsp;käynnissä"
-#~ msgid "DLS Index"
-#~ msgstr "DLS-hakemisto"
+#~ msgid "Decided"
+#~ msgstr "Päätetty"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Withdrawn"
+#~ msgstr "Vedetty pois"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG-VUKK"
+#~ msgid "Other"
+#~ msgstr "Muu"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal-arkisto"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Koti&nbsp;äänestyssivu"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kuinka"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, versio %s: %s"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ehdottaa"
-#~ msgid "Date published"
-#~ msgstr "Julkistuspäivämäärä"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Täydentää&nbsp;ehdotusta"
-#~ msgid "License"
-#~ msgstr "Lisenssi"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Seurata&nbsp;ehdotuksen&nbsp;kehitystä"
-#~ msgid "Version"
-#~ msgstr "Versio"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Lukea&nbsp;tulos"
-#~ msgid "Summary"
-#~ msgstr "Yhteenveto"
+#~ msgid "Vote"
+#~ msgstr "Äänestää"
-#~ msgid "Justification"
-#~ msgstr "Perustelu:"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgid "Discussion"
-#~ msgstr "Keskusteltavana"
+#~ msgid "network install"
+#~ msgstr "verkkoasennus"
-#~ msgid "Original Summary"
-#~ msgstr "Alkuperäinen yhteenveto"
+#~ msgid "buy pre-made images"
+#~ msgstr "osta valmiit romput"
+
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Takaisin muihin <a href=\"./\">Debian-uutisiin</a>."
+
+#~ msgid "discussed"
+#~ msgstr "keskusteltu"
#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
#~ msgstr ""
-#~ "Alkuperäinen yhteenveto, jonka valmisteli <summary-author/>, löytyy <a "
-#~ "href=\"<summary-url/>\">lista-arkistoista</a>."
+#~ "Katso <a href=\"./\">lisenssitietojen</a> sivulta yleiskatsausta Debianin "
+#~ "lisenssiyhteenvedoista (DLS)."
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Tämän yhteenvedon valmisteli <summary-author/>."
+#~ msgid "Not Redistributable"
+#~ msgstr "Ei jaeltavissa"
-#~ msgid "License text (translated)"
-#~ msgstr "Lisenssiteksti (käännetty)"
+#~ msgid "Non-Free"
+#~ msgstr "Epävapaa"
-#~ msgid "License text"
-#~ msgstr "Lisenssiteksti"
+#~ msgid "Free"
+#~ msgstr "Vapaa"
-#~ msgid "free"
-#~ msgstr "vapaa"
+#~ msgid "not redistributable"
+#~ msgstr "ei jaeltavissa"
#~ msgid "non-free"
#~ msgstr "epävapaa"
-#~ msgid "not redistributable"
-#~ msgstr "ei jaeltavissa"
+#~ msgid "free"
+#~ msgstr "vapaa"
-#~ msgid "Free"
-#~ msgstr "Vapaa"
+#~ msgid "License text"
+#~ msgstr "Lisenssiteksti"
-#~ msgid "Non-Free"
-#~ msgstr "Epävapaa"
+#~ msgid "License text (translated)"
+#~ msgstr "Lisenssiteksti (käännetty)"
-#~ msgid "Not Redistributable"
-#~ msgstr "Ei jaeltavissa"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Tämän yhteenvedon valmisteli <summary-author/>."
#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
#~ msgstr ""
-#~ "Katso <a href=\"./\">lisenssitietojen</a> sivulta yleiskatsausta Debianin "
-#~ "lisenssiyhteenvedoista (DLS)."
-
-#~ msgid "discussed"
-#~ msgstr "keskusteltu"
-
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Takaisin muihin <a href=\"./\">Debian-uutisiin</a>."
+#~ "Alkuperäinen yhteenveto, jonka valmisteli <summary-author/>, löytyy <a "
+#~ "href=\"<summary-url/>\">lista-arkistoista</a>."
-#~ msgid "buy pre-made images"
-#~ msgstr "osta valmiit romput"
+#~ msgid "Original Summary"
+#~ msgstr "Alkuperäinen yhteenveto"
-#~ msgid "network install"
-#~ msgstr "verkkoasennus"
+#~ msgid "Discussion"
+#~ msgstr "Keskusteltavana"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgid "Justification"
+#~ msgstr "Perustelu:"
-#~ msgid "Vote"
-#~ msgstr "Äänestää"
+#~ msgid "Summary"
+#~ msgstr "Yhteenveto"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Lukea&nbsp;tulos"
+#~ msgid "Version"
+#~ msgstr "Versio"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Seurata&nbsp;ehdotuksen&nbsp;kehitystä"
+#~ msgid "License"
+#~ msgstr "Lisenssi"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Täydentää&nbsp;ehdotusta"
+#~ msgid "Date published"
+#~ msgstr "Julkistuspäivämäärä"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ehdottaa"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, versio %s: %s"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kuinka"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Koti&nbsp;äänestyssivu"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal-arkisto"
-#~ msgid "Other"
-#~ msgstr "Muu"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG-VUKK"
-#~ msgid "Withdrawn"
-#~ msgstr "Vedetty pois"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Decided"
-#~ msgstr "Päätetty"
+#~ msgid "DLS Index"
+#~ msgstr "DLS-hakemisto"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Äänestys&nbsp;käynnissä"
+#~ msgid "License Information"
+#~ msgstr "Lisenssitiedot"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Keskusteltavana"
+#~ msgid "package info"
+#~ msgstr "pakettitietoa"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Kannatusta odottavat"
+#~ msgid "requested %s days ago."
+#~ msgstr "pyydetty %s päivää sitten."
-#~ msgid "Outcome"
-#~ msgstr "Tulos"
+#~ msgid "requested yesterday."
+#~ msgstr "pyydetty eilen."
-#~ msgid "Majority Requirement"
-#~ msgstr "Enemmistövaatimus"
+#~ msgid "requested today."
+#~ msgstr "pyydetty tänään."
-#~ msgid "Choices"
-#~ msgstr "Vaihtoehdot"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s päivää valmistelussa."
-#~ msgid "Proposal F"
-#~ msgstr "Ehdotus F"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "valmistelussa eilisestä lähtien."
-#~ msgid "Proposal E"
-#~ msgstr "Ehdotus E"
+#~ msgid "in preparation since today."
+#~ msgstr "valmistelussa tästä päivästä lähtien."
-#~ msgid "Proposal D"
-#~ msgstr "Ehdotus D"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s päivää adoptiossa."
-#~ msgid "Proposal C"
-#~ msgstr "Ehdotus C"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "adoptiossa eilisestä lähtien."
-#~ msgid "Proposal B"
-#~ msgstr "Ehdotus B"
+#~ msgid "in adoption since today."
+#~ msgstr "adoptiossa tästä päivästä lähtien."
-#~ msgid "Proposal A"
-#~ msgstr "Ehdotus A"
+#~ msgid "No help requested"
+#~ msgstr "Ei pyydetty apua"
-#~ msgid "Text"
-#~ msgstr "Teksti"
+#~ msgid "No Requested packages"
+#~ msgstr "Ei pyydettyjä paketteja"
-#~ msgid "Opposition"
-#~ msgstr "Vastustus"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Ei paketteja odottamassa paketointia"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Ehdotuksen F kannattajat"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Ei paketteja odottamassa adoptiota"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Ehdotuksen E kannattajat"
+#~ msgid "No orphaned packages"
+#~ msgstr "Ei orpoja paketteja"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Ehdotuksen D kannattajat"
+#~ msgid "No requests for adoption"
+#~ msgstr "Ei adoptointipyyntöjä"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Ehdotuksen C kannattajat"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a>."
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Ehdotuksen B kannattajat"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Ehdotuksen A kannattajat"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a>."
-#~ msgid "Seconds"
-#~ msgstr "Kannatukset"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Ehdotuksen F ehdottaja"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Saadaksesi tämän uutiskirjeen viikottain postilaatikkoosi, <a href="
+#~ "\"https://lists.debian.org/debian-news/\">liity debian-news-"
+#~ "postilistalle</a>."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Ehdotuksen E ehdottaja"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Takaisin <a href=\"./\">Debian-puhujasivulle</a>."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Ehdotuksen D ehdottaja"
+#~ msgid "List of Speakers"
+#~ msgstr "Lista puhujista"
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Ehdotuksen C ehdottaja"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsivät %s."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Ehdotuksen B ehdottaja"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsi %s."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Ehdotuksen A ehdottaja"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsivät %s."
-#~ msgid "Proposer"
-#~ msgstr "Ehdottaja"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsi %s."
-#~ msgid "Nominations"
-#~ msgstr "Nimeämiset"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Tämän Debianin projektikatsauksen toimittivat <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "Time Line"
-#~ msgstr "Aikajana"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Tämän Debianin projektikatsauksen toimitti <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "Date"
-#~ msgstr "Päiväys"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin projektikatsausta toimittavat <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Englanninkielinen <a href=\"/MailingLists/disclaimer\">julkinen "
-#~ "postilista</a> CD/DVD:ille:"
+#~ "Debianin projektikatsausta toimittaa <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />sekalaista"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Uutiskirjeen <a href=\"../../\">vanhoja numeroita</a> on myös saatavilla."
-#~ msgid "net_install"
-#~ msgstr "verkkoasennus"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Saadaksesi tämän uutiskirjeen joka toinen viikko postilaatikkoosi, <a "
+#~ "href=\"https://lists.debian.org/debian-news/\">liity debian-news-"
+#~ "postilistalle</a>."
-#~ msgid "buy"
-#~ msgstr "osta"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (poistettu osoite)"
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Takaisin: muihin <a href=\"./\">Debian-uutisiin</a> || <a href=\"m4_HOME/"
+#~ "\">Debian-projektin kotisivulle</a>."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Download calendar entry"
+#~ msgstr "Imuroi kalenterimerkintä"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />vukk"
+#~ msgid "Latest News"
+#~ msgstr "Tuoreimmat uutiset"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian cd:llä"
+#~ msgid "Related Links"
+#~ msgstr "Aiheeseen liittyviä linkkejä"
-#~ msgid "Debian CD team"
-#~ msgstr "Debian-CD-ryhmä"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekti</th><th>Koordinaattori</th>"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Vedosten julkaisutiedotteet"
+#~ msgid "Main Coordinator"
+#~ msgstr "Pääkoordinoija"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Lataa torrentilla"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debianin osallisuus"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-peilit"
+#~ msgid "More Info"
+#~ msgstr "Lisätietoa"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Peilaukset"
+#~ msgid "Where"
+#~ msgstr "Missä"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Kansikuvia"
+#~ msgid "When"
+#~ msgstr "Milloin"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Sekalaista"
+#~ msgid "link may no longer be valid"
+#~ msgstr "linkki voi olla vanhentunut"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Lataa verkosta"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Tulevia tapahtumia"
-#~ msgid "Network Install"
-#~ msgstr "Verkkoasennus"
+#~ msgid "More information"
+#~ msgstr "Lisätietoa"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Osta CD:t/DVD:t"
+#~ msgid "Report it!"
+#~ msgstr "Ilmoita siitä!"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Lataa http/ftp:llä"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Oletko havainnut ongelman sivuston ulkoasussa?"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Lataa jigdolla"
+#~ msgid "Rating:"
+#~ msgstr "Aste:"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Nobody"
+#~ msgstr "Ei kukaan"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Takaisin <a href=\"./\">Debian-konsulttisivulle</a>."
+#~ msgid "Taken by:"
+#~ msgstr "Ottanut:"
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulttilista"
+#~ msgid "More information:"
+#~ msgstr "Lisätietoa:"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Vierailethan sivuston sponsorilla"
+#~ msgid "Select a server near you"
+#~ msgstr "Valitse läheinen palvelin"
diff --git a/finnish/po/vendors.fi.po b/finnish/po/vendors.fi.po
index 232f54a4533..cc56b76195d 100644
--- a/finnish/po/vendors.fi.po
+++ b/finnish/po/vendors.fi.po
@@ -63,74 +63,74 @@ msgstr "lähdekoodi"
msgid "and"
msgstr "ja"
-#~ msgid "updated monthly"
-#~ msgstr "uudistetaan kuukausittain"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "uudistetaan kahdesti viikossa"
+#~ msgid "Vendor:"
+#~ msgstr "Toimittaja:"
-#~ msgid "updated weekly"
-#~ msgstr "uudistetaan viikottain"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-sivun osoite:"
-#~ msgid "reseller"
-#~ msgstr "jälleenmyyjä"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Antaa mahdollisuuden lahjoittaa Debianille:"
-#~ msgid "reseller of $var"
-#~ msgstr "$var:n jälleenmyyjä"
+#~ msgid "Country:"
+#~ msgstr "Maa:"
-#~ msgid "Custom Release"
-#~ msgstr "Räätälöity versio"
+#~ msgid "Ship International:"
+#~ msgstr "Toimittaa kaikkialle maailmaan:"
-#~ msgid "vendor additions"
-#~ msgstr "toimittajan lisäyksiä"
+#~ msgid "email:"
+#~ msgstr "Sähköposti:"
-#~ msgid "contrib included"
-#~ msgstr "contrib-osio mukana"
+#~ msgid "CD Type:"
+#~ msgstr "CD:n tyyppi:"
-#~ msgid "non-free included"
-#~ msgstr "non-free-osio mukana"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD:n tyyppi:"
-#~ msgid "non-US included"
-#~ msgstr "non-US-osio mukana"
+#~ msgid "Architectures:"
+#~ msgstr "Arkkitehtuurit:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Useita versioita"
+#~ msgid "Official CD"
+#~ msgstr "Virallinen CD"
-#~ msgid "Vendor Release"
-#~ msgstr "Toimittajan oma versio"
+#~ msgid "Official DVD"
+#~ msgstr "Virallinen DVD"
#~ msgid "Development Snapshot"
#~ msgstr "Kehitysversion vedos"
-#~ msgid "Official DVD"
-#~ msgstr "Virallinen DVD"
+#~ msgid "Vendor Release"
+#~ msgstr "Toimittajan oma versio"
-#~ msgid "Official CD"
-#~ msgstr "Virallinen CD"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Useita versioita"
-#~ msgid "Architectures:"
-#~ msgstr "Arkkitehtuurit:"
+#~ msgid "non-US included"
+#~ msgstr "non-US-osio mukana"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD:n tyyppi:"
+#~ msgid "non-free included"
+#~ msgstr "non-free-osio mukana"
-#~ msgid "CD Type:"
-#~ msgstr "CD:n tyyppi:"
+#~ msgid "contrib included"
+#~ msgstr "contrib-osio mukana"
-#~ msgid "email:"
-#~ msgstr "Sähköposti:"
+#~ msgid "vendor additions"
+#~ msgstr "toimittajan lisäyksiä"
-#~ msgid "Ship International:"
-#~ msgstr "Toimittaa kaikkialle maailmaan:"
+#~ msgid "Custom Release"
+#~ msgstr "Räätälöity versio"
-#~ msgid "Country:"
-#~ msgstr "Maa:"
+#~ msgid "reseller of $var"
+#~ msgstr "$var:n jälleenmyyjä"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Antaa mahdollisuuden lahjoittaa Debianille:"
+#~ msgid "reseller"
+#~ msgstr "jälleenmyyjä"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Debian-sivun osoite:"
+#~ msgid "updated weekly"
+#~ msgstr "uudistetaan viikottain"
-#~ msgid "Vendor:"
-#~ msgstr "Toimittaja:"
+#~ msgid "updated twice weekly"
+#~ msgstr "uudistetaan kahdesti viikossa"
+
+#~ msgid "updated monthly"
+#~ msgstr "uudistetaan kuukausittain"
diff --git a/french/po/blends.fr.po b/french/po/blends.fr.po
index 4592f5be303..99f416f23c6 100644
--- a/french/po/blends.fr.po
+++ b/french/po/blends.fr.po
@@ -177,8 +177,8 @@ msgstr ""
"L’objectif de « DebianParl » est de fournir des applications pour les "
"parlementaires, politiciens et leurs collaborateurs partout dans le monde."
-#~ msgid "Debian Accessibility"
-#~ msgstr "Debian Accessibility"
-
#~ msgid "Debian Games"
#~ msgstr "Debian Games"
+
+#~ msgid "Debian Accessibility"
+#~ msgstr "Debian Accessibility"
diff --git a/french/po/distrib.fr.po b/french/po/distrib.fr.po
index b46f1aca425..369a1273e4f 100644
--- a/french/po/distrib.fr.po
+++ b/french/po/distrib.fr.po
@@ -211,23 +211,23 @@ msgstr "System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/french/po/doc.fr.po b/french/po/doc.fr.po
index dffa050a865..87fa81f93ab 100644
--- a/french/po/doc.fr.po
+++ b/french/po/doc.fr.po
@@ -225,13 +225,13 @@ msgstr "(version <get-var version />)"
msgid "plain text"
msgstr "texte seul"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"Les dernières sources au format <get-var srctype /> sont disponibles dans le "
-"<a href=\"https://www.debian.org/doc/cvs\">dépôt Subversion</a>."
+"dépôt <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
@@ -259,14 +259,6 @@ 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:178
-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:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -296,3 +288,10 @@ msgstr "HTML"
#: ../../english/releases/arches.data:36
msgid "PDF"
msgstr "PDF"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Les dernières sources au format <get-var srctype /> sont disponibles dans "
+#~ "le <a href=\"https://www.debian.org/doc/cvs\">dépôt Subversion</a>."
diff --git a/french/po/mailinglists.fr.po b/french/po/mailinglists.fr.po
index 5cf0b35b1e9..c883bc995bf 100644
--- a/french/po/mailinglists.fr.po
+++ b/french/po/mailinglists.fr.po
@@ -137,11 +137,11 @@ msgstr "ouverte"
msgid "closed"
msgstr "fermée"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr ""
+#~ "Veuillez choisir les listes auxquelles vous souhaitez vous abonner&nbsp;:"
+
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Veuillez choisir les listes desquelles vous souhaitez vous "
#~ "désabonner&nbsp;:"
-
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr ""
-#~ "Veuillez choisir les listes auxquelles vous souhaitez vous abonner&nbsp;:"
diff --git a/french/po/newsevents.fr.po b/french/po/newsevents.fr.po
index b056405f7fe..7805c1ea02c 100644
--- a/french/po/newsevents.fr.po
+++ b/french/po/newsevents.fr.po
@@ -565,6 +565,18 @@ msgstr ""
"<void id=\"plural\" />Ce numéro de la Debian Weekly News a été édité par <a "
"href=\"mailto:dwn@debian.org\">%s</a>."
+#, fuzzy
+#~| msgid "Debian News"
+#~ msgid ""
+#~ "Debian Project\n"
+#~ "News"
+#~ msgstr "Actualités Debian"
+
+#, fuzzy
+#~| msgid "Debian Latest News"
+#~ msgid "Debian Project News"
+#~ msgstr "Dernières nouvelles de Debian"
+
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
@@ -575,15 +587,3 @@ msgstr ""
#~ "\">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."
-
-#, fuzzy
-#~| msgid "Debian Latest News"
-#~ msgid "Debian Project News"
-#~ msgstr "Dernières nouvelles de Debian"
-
-#, fuzzy
-#~| msgid "Debian News"
-#~ msgid ""
-#~ "Debian Project\n"
-#~ "News"
-#~ msgstr "Actualités Debian"
diff --git a/french/po/organization.fr.po b/french/po/organization.fr.po
index 43d73ad1773..5f33f5d21c7 100644
--- a/french/po/organization.fr.po
+++ b/french/po/organization.fr.po
@@ -14,6 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian webwml organisation 0.1\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-03-22 20:56+0100\n"
"Last-Translator: Baptiste Jammet <baptiste@mailoo.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -23,7 +24,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"POT-Creation-Date: \n"
#: ../../english/intro/organization.data:15
msgid "delegation mail"
@@ -87,22 +87,22 @@ msgid "Officers"
msgstr "Directeurs"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribution"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr "Communication et ouverture"
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Équipe de publicité"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Assistance et infrastructure"
@@ -119,179 +119,179 @@ msgstr "Chef du projet"
msgid "Technical Committee"
msgstr "Comité technique"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Secrétaire"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Projets de développement"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Archives FTP"
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Responsables du FTP"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Assistants pour le FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Conseillers pour le FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Rétroportages"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Équipe en charge des rétroportages"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Paquets individuels"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Organisation des nouvelles versions"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Équipe de publication"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Assurance qualité"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Équipe du système d'installation"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Notes de publication"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Images CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Production"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infrastructure des empaqueteurs automatiques"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Équipe en charge de wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Administration des démons de construction"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Documentation"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Liste des paquets en souffrance et paquets souhaités"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr "Équipe Debian Live"
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Portages"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Configurations spéciales"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Portables"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Pare-feux"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Systèmes embarqués"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Contact presse"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Pages web"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Programme d'ouverture"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Projet Debian Women"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Anti-harcèlement"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Événements"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "Comité DebConf"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Programme de partenariat"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Coordination des dons de machines"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Assistance aux utilisateurs"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Système de suivi des bogues"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administration et archives des listes de diffusion"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Secrétariat des nouveaux membres"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Responsables des comptes de Debian"
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -299,31 +299,31 @@ msgstr ""
"Pour envoyer un message privé à tous les gestionnaires de comptes (DAM), "
"veuillez utiliser la clef GPG 57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Responsable du fichier de clefs (PGP et GPG)"
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Équipe de sécurité"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Page des consultants"
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Pages des revendeurs de CD"
-#: ../../english/intro/organization.data:412
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Normes"
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Administration système"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -332,7 +332,7 @@ msgstr ""
"des machines Debian, en particulier les problèmes de mots de passe ou si "
"vous souhaitez l'installation d'un nouveau paquet."
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -343,106 +343,104 @@ msgstr ""
"\">machines Debian</a>, elle pourrait contenir des informations fournies par "
"l'administrateur de la machine."
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrateur de la base LDAP des développeurs"
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Miroirs"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Responsable DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Système de suivi de paquets"
-#: ../../english/intro/organization.data:440
+#: ../../english/intro/organization.data:444
msgid "Treasurer"
msgstr "Trésorier"
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
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:449
-#| msgid "Alioth administrators"
+#: ../../english/intro/organization.data:453
msgid "Salsa administrators"
msgstr "Administration de Salsa"
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administration d'Alioth"
-#: ../../english/intro/organization.data:466
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian pour les enfants de 1 à 99 ans"
-#: ../../english/intro/organization.data:469
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian pour la pratique médicale et la recherche"
-#: ../../english/intro/organization.data:472
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian pour l'éducation"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian dans les organismes juridiques"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian pour les personnes handicapées"
-#: ../../english/intro/organization.data:485
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian pour la science et la recherche associée"
-#: ../../english/intro/organization.data:488
-#| msgid "Debian for education"
+#: ../../english/intro/organization.data:492
msgid "Debian for astronomy"
msgstr "Debian pour l'astronomie"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Chef du projet actuel"
+#~ msgid "Live System Team"
+#~ msgstr "Équipe du système autonome (« Live »)"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Administrateurs du Summer of Code 2013"
+#~ msgid "Auditor"
+#~ msgstr "Commissaire aux comptes"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (inactif : non publié avec Squeeze)"
+#~ msgid "Publicity"
+#~ msgstr "Publicité"
-#~ msgid "Volatile Team"
-#~ msgstr "Équipe en charge de volatile"
+#~ msgid "Bits from Debian"
+#~ msgstr "Brèves de Debian"
-#~ msgid "Vendors"
-#~ msgstr "Revendeurs"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Responsables du fichier de clefs des mainteneurs Debian (DM)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projet d'audit de sécurité"
+#~ msgid "DebConf chairs"
+#~ msgstr "Responsables de DebConf"
#~ msgid "Testing Security Team"
#~ msgstr "Équipe de sécurité de testing"
-#~ msgid "DebConf chairs"
-#~ msgstr "Responsables de DebConf"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projet d'audit de sécurité"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Responsables du fichier de clefs des mainteneurs Debian (DM)"
+#~ msgid "Vendors"
+#~ msgstr "Revendeurs"
-#~ msgid "Bits from Debian"
-#~ msgstr "Brèves de Debian"
+#~ msgid "Volatile Team"
+#~ msgstr "Équipe en charge de volatile"
-#~ msgid "Publicity"
-#~ msgstr "Publicité"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (inactif : non publié avec Squeeze)"
-#~ msgid "Auditor"
-#~ msgstr "Commissaire aux comptes"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Administrateurs du Summer of Code 2013"
-#~ msgid "Live System Team"
-#~ msgstr "Équipe du système autonome (« Live »)"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Chef du projet actuel"
diff --git a/french/po/others.fr.po b/french/po/others.fr.po
index 55d6b9d11df..9c9d8f4fac0 100644
--- a/french/po/others.fr.po
+++ b/french/po/others.fr.po
@@ -336,17 +336,17 @@ msgstr "Version"
msgid "URL"
msgstr "URL"
-#~ msgid "Wanted:"
-#~ msgstr "Désiré :"
+#~ msgid "Where:"
+#~ msgstr "Localisation :"
-#~ msgid "Who:"
-#~ msgstr "Demandeur :"
+#~ msgid "Specifications:"
+#~ msgstr "Spécifications :"
#~ msgid "Architecture:"
#~ msgstr "Architectures :"
-#~ msgid "Specifications:"
-#~ msgstr "Spécifications :"
+#~ msgid "Who:"
+#~ msgstr "Demandeur :"
-#~ msgid "Where:"
-#~ msgstr "Localisation :"
+#~ msgid "Wanted:"
+#~ msgstr "Désiré :"
diff --git a/french/po/partners.fr.po b/french/po/partners.fr.po
index e9a6211ca00..9cd2917d88b 100644
--- a/french/po/partners.fr.po
+++ b/french/po/partners.fr.po
@@ -62,10 +62,6 @@ msgstr ""
"Debian avec plusieurs milliers de serveurs."
#: ../../english/partners/partners.def:41
-#| msgid ""
-#| "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-#| "support us by providing hosting services and sponsorship for the Debian "
-#| "Conference."
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."
@@ -75,13 +71,6 @@ msgstr ""
"conférence Debian."
#: ../../english/partners/partners.def:45
-#| msgid ""
-#| "They are a leading Internet Service Provider (ISP) in the United Kingdom "
-#| "and provide scalable, powerful and affordable hosting with lots of "
-#| "<q>geek friendly</q> extras as standard. Debian GNU/Linux is deployed "
-#| "extensively within their network, and comes recommended as the "
-#| "<q>Distribution of Choice</q> to any new customer who's not 100% sure on "
-#| "what to pick."
msgid ""
"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
"provide scalable, powerful and affordable hosting with lots of <q>geek "
@@ -713,11 +702,13 @@ msgstr ""
"produits utilisent des outils et systèmes d'exploitation open source."
#~ msgid ""
-#~ "They are a UK based web hosting, domain registration and co-location\n"
-#~ " company."
+#~ "credativ is a service oriented company focusing on open-source software "
+#~ "since its foundation in 1999. World-wide Debian support is provided by "
+#~ "credativ's <q>Open Source Support Centers</q> around the globe."
#~ msgstr ""
-#~ "Cette entreprise basée au Royaume-Uni, propose de l'hébergement web, de "
-#~ "l'enregistrement de noms de domaines et de la colocation."
+#~ "credativ est une société de services spécialisée dans les logiciels "
+#~ "Open Source depuis sa création en 1999. Le support de Debian à travers le "
+#~ "monde est fourni par l'<q>Open Source Support Center</q> de credativ."
#~ msgid ""
#~ "A large number of credativ staff are Debian developers, several of them "
@@ -731,10 +722,8 @@ msgstr ""
#~ "d'informations, veuillez visitez <url \"http://www.credativ.com/\">."
#~ msgid ""
-#~ "credativ is a service oriented company focusing on open-source software "
-#~ "since its foundation in 1999. World-wide Debian support is provided by "
-#~ "credativ's <q>Open Source Support Centers</q> around the globe."
+#~ "They are a UK based web hosting, domain registration and co-location\n"
+#~ " company."
#~ msgstr ""
-#~ "credativ est une société de services spécialisée dans les logiciels "
-#~ "Open Source depuis sa création en 1999. Le support de Debian à travers le "
-#~ "monde est fourni par l'<q>Open Source Support Center</q> de credativ."
+#~ "Cette entreprise basée au Royaume-Uni, propose de l'hébergement web, de "
+#~ "l'enregistrement de noms de domaines et de la colocation."
diff --git a/french/po/ports.fr.po b/french/po/ports.fr.po
index 6e52c3a3282..b3ae6e433fd 100644
--- a/french/po/ports.fr.po
+++ b/french/po/ports.fr.po
@@ -117,32 +117,32 @@ msgstr "Debian pour PowerPC"
msgid "Debian for Sparc"
msgstr "Debian pour Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian pour portables"
-
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian pour Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian pour AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian pour S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian pour ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian pour MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian pour Beowulf"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian pour Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Menu principal"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Main"
-#~ msgstr "Menu principal"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian pour Motorola 680x0"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian pour Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian pour MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian pour ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian pour S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian pour AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian pour Sparc64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian pour portables"
diff --git a/french/po/stats.fr.po b/french/po/stats.fr.po
index 485d348cb4c..c9450b0be3d 100644
--- a/french/po/stats.fr.po
+++ b/french/po/stats.fr.po
@@ -32,79 +32,90 @@ msgstr "%d octets sont à traduire."
msgid "There are %d strings to translate."
msgstr "%d chaînes sont à traduire."
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
-msgstr "Cette traduction est trop incomplète"
-
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Mauvaise version de traduction"
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Cette traduction est trop incomplète"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "L'original est plus récent que sa traduction"
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "L'original n'existe plus"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "Nombre de visites indisponible"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "visites"
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Cliquer pour récupérer les statistiques du différentiel"
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Différentiel unifié"
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Différentiel coloré"
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Différentiel coloré"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Créé avec <transstatslink>"
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Vue globale des traductions pour la langue :"
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Non traduites"
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Incomplètes"
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Traduites"
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "À jour"
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "fichiers"
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "octets"
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -112,136 +123,136 @@ msgstr ""
"Remarque : les listes de pages sont classées par popularité. Le nombre de "
"visites apparaît lorsque le pointeur passe sur le nom de la page."
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Traductions incomplètes"
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Fichier"
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Différentiel"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Commentaire"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Statistiques du différentiel"
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Journal"
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Traduction"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Responsable"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "État"
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Traducteur"
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Date"
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Pages générales non traduites"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Pages générales non traduites"
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Nouvelles non traduites"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Nouvelles non traduites"
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Pages de consultants et d'utilisateurs non traduites"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Pages de consultants et d'utilisateurs non traduites"
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Pages internationales non traduites"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Pages internationales non traduites"
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Pages web traduites (à jour)"
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Chaînes traduites (fichiers PO)"
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Statistiques de traduction des fichiers PO"
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Approximatives"
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Non traduites"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Total :"
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Pages web traduites"
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Statistiques de traduction par nombre de pages"
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Langue"
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Traductions"
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Pages web traduites (par taille)"
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Statistiques de traduction par taille de pages"
-#~ msgid "Origin"
-#~ msgstr "Original"
-
#~ msgid "Created with"
#~ msgstr "Page créée avec"
+
+#~ msgid "Origin"
+#~ msgstr "Original"
diff --git a/french/po/templates.fr.po b/french/po/templates.fr.po
index c61a06c8fe9..3d2b68fd554 100644
--- a/french/po/templates.fr.po
+++ b/french/po/templates.fr.po
@@ -15,6 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian webwml templates 0.1\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-03-22 20:56+0100\n"
"Last-Translator: Baptiste Jammet <baptiste@mailoo.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -24,7 +25,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"POT-Creation-Date: \n"
#: ../../english/search.xml.in:7
msgid "Debian website"
@@ -211,18 +211,19 @@ msgstr "dans la version 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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>."
+#| "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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Pour signaler un problème sur le site web, envoyez un courriel à l'une de "
"nos listes de diffusion archivées publiquement : en anglais à <a href="
@@ -525,6 +526,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Note&nbsp;:</em> le document original n'existe plus."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -533,35 +538,35 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Retour à la <a href=\"../\">page des utilisateurs de Debian</a>."
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Le site de notre sponsor"
+#~ msgid ""
+#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Checkout repository</a> | <a "
+#~ "href=\"https://anonscm.debian.org/viewvc/webwml/webwml/\">Browse "
+#~ "repository</a>"
+#~ msgstr ""
+#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Récupérer les sources</a> | "
+#~ "<a href=\"https://anonscm.debian.org/viewvc/webwml/webwml/\">Naviguer "
+#~ "dans le dépôt</a>"
-#~ msgid "More information:"
-#~ msgstr "Plus d'informations :"
+#~ msgid "Select a server near you"
+#~ msgstr "Choisissez un serveur proche de vous"
-#~ msgid "Taken by:"
-#~ msgstr "Pris en charge par :"
+#~ msgid "Report it!"
+#~ msgstr "Signalez-le !"
-#~ msgid "Nobody"
-#~ msgstr "Personne"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Avez-vous découvert un problème dans la mise en page du site ?"
#~ msgid "Rating:"
#~ msgstr "Classement&nbsp;"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Avez-vous découvert un problème dans la mise en page du site ?"
+#~ msgid "Nobody"
+#~ msgstr "Personne"
-#~ msgid "Report it!"
-#~ msgstr "Signalez-le !"
+#~ msgid "Taken by:"
+#~ msgstr "Pris en charge par :"
-#~ msgid "Select a server near you"
-#~ msgstr "Choisissez un serveur proche de vous"
+#~ msgid "More information:"
+#~ msgstr "Plus d'informations :"
-#~ msgid ""
-#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Checkout repository</a> | <a "
-#~ "href=\"https://anonscm.debian.org/viewvc/webwml/webwml/\">Browse "
-#~ "repository</a>"
-#~ msgstr ""
-#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Récupérer les sources</a> | "
-#~ "<a href=\"https://anonscm.debian.org/viewvc/webwml/webwml/\">Naviguer "
-#~ "dans le dépôt</a>"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Le site de notre sponsor"
diff --git a/french/po/vendors.fr.po b/french/po/vendors.fr.po
index 8d0311eba06..0bc3c654615 100644
--- a/french/po/vendors.fr.po
+++ b/french/po/vendors.fr.po
@@ -67,29 +67,29 @@ msgstr "source"
msgid "and"
msgstr "et"
-#~ msgid "Vendor:"
-#~ msgstr "Vendeur :"
+#~ msgid "Architectures:"
+#~ msgstr "Architectures :"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL de la page Debian :"
+#~ msgid "DVD Type:"
+#~ msgstr "Type de DVD :"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Accepte une donation à Debian :"
+#~ msgid "CD Type:"
+#~ msgstr "Type de CD :"
-#~ msgid "Country:"
-#~ msgstr "Pays :"
+#~ msgid "email:"
+#~ msgstr "mél :"
#~ msgid "Ship International:"
#~ msgstr "Expédition internationale :"
-#~ msgid "email:"
-#~ msgstr "mél :"
+#~ msgid "Country:"
+#~ msgstr "Pays :"
-#~ msgid "CD Type:"
-#~ msgstr "Type de CD :"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Accepte une donation à Debian :"
-#~ msgid "DVD Type:"
-#~ msgstr "Type de DVD :"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL de la page Debian :"
-#~ msgid "Architectures:"
-#~ msgstr "Architectures :"
+#~ msgid "Vendor:"
+#~ msgstr "Vendeur :"
diff --git a/galician/po/blends.gl.po b/galician/po/blends.gl.po
index 64b8c15bf29..b00934651af 100644
--- a/galician/po/blends.gl.po
+++ b/galician/po/blends.gl.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/galician/po/doc.gl.po b/galician/po/doc.gl.po
index 21ca4450e1c..6f1757ae399 100644
--- a/galician/po/doc.gl.po
+++ b/galician/po/doc.gl.po
@@ -29,8 +29,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
#, fuzzy
#| msgid ""
#| "Written by two Debian developers, this free book\n"
@@ -82,42 +82,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:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 arquitectura ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-"Este libro é para desenvolvedores que traballan con GNU/Linux en "
-"procesadores ARM. Cobre algúns dispositivos especificamente para "
-"configuracións rápidas (LART, Assabet, Psion5). Tamén dá información, "
-"ferramentas e técnicas xenéricas. A cadea de ferramentas GNU está cuberta "
-"tanto en nativo como en compilación cruzada, así como os cargadores de "
-"arranque, parches do núcleo, discos RAM, particularidades de ARM e outros "
-"recursos de ARM. Tamén inclúe extensiva información titorial acerca do "
-"esencial de GNU/Linux para desenvolvedores que veñen de outras plataformas. "
-"Non é específico de Debian, pero a distribución «Aleph ARM Linux» está "
-"baseada moi de preto en Debian ARM e asúmese que se traballará en esa "
-"distribución e preferiblemente tendo tamén unha máquina baseada en Debian."
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -136,7 +101,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:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -148,7 +113,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
#, fuzzy
#| msgid ""
#| "This book teaches you how to install and configure the system and also "
@@ -167,6 +132,22 @@ 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
+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:"
@@ -219,13 +200,13 @@ msgstr "(versión <get-var version />)"
msgid "plain text"
msgstr "texto plano"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-"href=\"https://www.debian.org/doc/cvs\">Subversion</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
@@ -253,14 +234,6 @@ msgstr ""
"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
"href=\"https://packages.debian.org/subversion\">Subversion</a>."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-"href=\"https://packages.debian.org/git\">Git</a>."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -291,174 +264,110 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "Está dispoñíbel unha <a href=\"http://www.lob.de/cgi-bin/work/"
-#~ "outputexpert?mode=viewone&amp;titnr=254925022\">\n"
-#~ " publicación </a> alternativa en Lehmanns Fachbuchhandlung e custa "
-#~ "29.95\n"
-#~ " euros (en 2008)."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD de Sarge co instalador e unha selección de paquetes"
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
-#~ "var ddp_pkg_loc />."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live Cd con Knoppix"
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Este é o libro ideal para aprender como crear plataformas IT básicas e "
-#~ "complexas usando tan só software libre. Dentro atopará unha ampla "
-#~ "variedade de procedementos revisados e axustados para encaixar na boas "
-#~ "prácticas da implementación de infraestrutura tecnolóxica. Esta guía "
-#~ "exhaustiva e doada de ler levarao da man para acadar obxectivos "
-#~ "específicos co sistema operativo Debian GNU/Linux."
+#~ "Tanto principiantes como usuarios avanzados descubrirán que este libro é "
+#~ "unha fonte de información exhaustiva sobre o uso de Debian para "
+#~ "escritorios, servidores de internet e intranet e desenvolvemento. Tamén "
+#~ "contén información básica do proxecto e unha cobertura extensa do sistema "
+#~ "de xestión de paquetes de Debian."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Este libro está dividido en catro partes: Conceptos básicos, xestión de "
-#~ "GNU/Linux, administración do sistema e operacións avanzadas. Cada "
-#~ "capítulo explica en profundidade as características do sistema operativo. "
-#~ "Os primeiros capítulos explican a estrutura de GNU/Linux. Estes capítulos "
-#~ "axudarán ao lector a entender como fai uso o sistema dos recursos básicos "
-#~ "como o procesador e a memoria. Un análise detallado dos sistemas de "
-#~ "ficheiros ext2, ext3 e ReiserFS capacitarán aos usuarios para facer a "
-#~ "escolla correcta segundo as súas necesidades. Moitas cifras ao longo do "
-#~ "libro mostran aspectos sobre a eficiencia do sistema. Este libro servirá "
-#~ "a estudantes e a calquera que queira aprender GNU/Linux en profundidade. "
-#~ "Este libro basease en Debian Sarge."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "Debian GNU/Linux 3.1r0a «sarge» oficial en DVD (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "O primeiro libro Persa sobre Debian GNU/Linux. Este libro axúdao a "
-#~ "instalar Debian GNU/Linux e a configurar servizos de rede como webs, "
-#~ "bases de datos, devasas, correos electrónicos, ftp entre outros. Tamén "
-#~ "lle axuda a comezar usando GNU/Linux e o potente sistema de xestión de "
-#~ "paquetes de Debian."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Este libro introduce os conceptos e técnicas do sistema operativo Debian, "
+#~ "explicando o seu uso e erros comúns e ilustrando a motivación detrás de "
+#~ "cada unha destas aproximacións. O obxectivo non é ser un libro de "
+#~ "referencia, senón dar ao lector un coñecemento suficiente acerca da forma "
+#~ "de funcionar do proxecto e do sistema operativo para aprender e adoptar "
+#~ "as sofisticadas e elegantes, e as veces pouco intuitivas a primeira "
+#~ "vista, solucións que evolucionaron como parte do sistema Debian ao longo "
+#~ "da pasada década. Inda que está destinado a administradores UNIX/Linux "
+#~ "experimentados, este libro tamén pode servir como un recurso excelente "
+#~ "xunto con unha referencia estándar de Linux para comezar a experiencia "
+#~ "propia en Linux ca filosofía de abaixo a arriba de Debian. "
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Este libro introduce aos lectores a Debian GNU/Linux con moitos titoriais "
-#~ "prácticos e consellos. Escrito en coreano, este libro cobre todos os "
-#~ "aspectos do sistema Debian GNU/Linux: instalación por primeira vez, "
-#~ "instalación de paquetes, configuración das X, conexión a internet, "
-#~ "mantemento da rede entre outros. Este libro proporciona unha morea de "
-#~ "consellos para configurar Debian para un ambiente en lingua coreana, e "
-#~ "tamén resulta bo para os non iniciados."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Tres CDs oficiais de Potato r3 e un CD non oficial de Woody"
+#~ "Unha guía de referencia práctica do sistema Debian GNU/Linux que mostra "
+#~ "en máis de 1.500 <q>receitas</q> como usalo para actividades diarias; "
+#~ "desde traballar con texto, imaxes e son a produtividade e problemas de "
+#~ "rede. Igual que o software que o libro describe, este libro ten "
+#~ "«copyleft» e as fontes están dispoñíbeis."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Este libro ofrece unha breve guía de instalación de Debian GNU/Linux, o "
-#~ "básico das ordes de Unix ou Linux, configuración básica e mantemento do "
-#~ "sistema e da rede. Configuración do sistema de xanelas X e uso de "
-#~ "multimedia en Debian GNU/Linux. Este libro tamén inclúe unha guía para "
-#~ "mantedores, o que estimula a xente en Corea a converterse en mantedores "
-#~ "oficiais de Debian."
+#~ "«Learning Debian GNU/Linux» guía ao novo usuario de Linux a través da "
+#~ "instalación e configuración de Debian GNU/Linux. Os usuarios de Windows "
+#~ "obterán unha amable introdución a este excitante mundo da computación "
+#~ "guiados por Bill McCarty en <q>Learning Debian GNU/Linux (Aprendendo "
+#~ "Debian GNU/Linux)</q>."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "un non oficial de Woody e tres de Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Este libro cobre temas xerais sobre Debian GNU/Linux: instalación, APT e "
-#~ "dpkg, o intérprete de ordes, o sistema de xanelas X, rede, administración "
-#~ "do sistema, configuración do núcleo, compartir con Windows, construción "
-#~ "de servidores e demais. Poderá instalar e comezar a usar o ambiente en "
-#~ "xaponés de Debian GNU/Linux de forma doada cos CDs personalizados."
+#~ "Inclúe máis de 230 páxinas e tres discos CDROM. Os temas que cobre o "
+#~ "software inclúen Debian Linux, rede, ferramentas de programación, "
+#~ "interfaces gráficas de usuario (GUI), publicación de escritorio, "
+#~ "negocios, cousas simpáticas e multimedia. Inclúe 30 días de asistencia "
+#~ "gratuíta por correo electrónico."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 edición do autor (3 CDs)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Este é o último libro para Sarge da serie que foi declarada a biblia de "
-#~ "Debian en Xapón. Este libro cobre todos os aspectos do uso de Debian GNU/"
-#~ "Linux 3.1 Sarge, como a instalación, ambientes de escritorio, sistemas de "
-#~ "administración e configuración de servidores. Ademais, este libro tamén "
-#~ "inclúe un paquete de tipografías comerciais que decora o seu escritorio. "
-#~ "Este libro pode ser útil para todos os usuarios de Debian, desde os "
-#~ "principiantes aos usuarios avanzados."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "dúas edicións: unha sen DVD, a outra con dous DVDs (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, edición do autor (DVD + CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) en DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Este libro é do estilo dun dicionario e cobre varios consellos para "
-#~ "usuarios principiantes e de nivel intermedio, a instalación mediante "
-#~ "diferentes medios, a personalización do escritorio, resolución de "
-#~ "problemas e unha proveitosa lista de receitas, entre outras cousas."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Instalador de Debian GNU/Linux 3.1 Sarge (un só CD)"
+#~ "Dúas edicións: Unha sen CD, outra co CD oficial (i386, contrib e fontes)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -490,107 +399,213 @@ msgstr "PDF"
#~ "encamiñador «dial-in» ou un servidor para clientes baseados en Windows "
#~ "(Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Instalador de Debian GNU/Linux 3.1 Sarge (un só CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "Dúas edicións: Unha sen CD, outra co CD oficial (i386, contrib e fontes)"
+#~ "Este libro é do estilo dun dicionario e cobre varios consellos para "
+#~ "usuarios principiantes e de nivel intermedio, a instalación mediante "
+#~ "diferentes medios, a personalización do escritorio, resolución de "
+#~ "problemas e unha proveitosa lista de receitas, entre outras cousas."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) en DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, edición do autor (DVD + CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "dúas edicións: unha sen DVD, a outra con dous DVDs (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Este é o último libro para Sarge da serie que foi declarada a biblia de "
+#~ "Debian en Xapón. Este libro cobre todos os aspectos do uso de Debian GNU/"
+#~ "Linux 3.1 Sarge, como a instalación, ambientes de escritorio, sistemas de "
+#~ "administración e configuración de servidores. Ademais, este libro tamén "
+#~ "inclúe un paquete de tipografías comerciais que decora o seu escritorio. "
+#~ "Este libro pode ser útil para todos os usuarios de Debian, desde os "
+#~ "principiantes aos usuarios avanzados."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edición do autor (3 CDs)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Inclúe máis de 230 páxinas e tres discos CDROM. Os temas que cobre o "
-#~ "software inclúen Debian Linux, rede, ferramentas de programación, "
-#~ "interfaces gráficas de usuario (GUI), publicación de escritorio, "
-#~ "negocios, cousas simpáticas e multimedia. Inclúe 30 días de asistencia "
-#~ "gratuíta por correo electrónico."
+#~ "Este libro cobre temas xerais sobre Debian GNU/Linux: instalación, APT e "
+#~ "dpkg, o intérprete de ordes, o sistema de xanelas X, rede, administración "
+#~ "do sistema, configuración do núcleo, compartir con Windows, construción "
+#~ "de servidores e demais. Poderá instalar e comezar a usar o ambiente en "
+#~ "xaponés de Debian GNU/Linux de forma doada cos CDs personalizados."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "un non oficial de Woody e tres de Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "«Learning Debian GNU/Linux» guía ao novo usuario de Linux a través da "
-#~ "instalación e configuración de Debian GNU/Linux. Os usuarios de Windows "
-#~ "obterán unha amable introdución a este excitante mundo da computación "
-#~ "guiados por Bill McCarty en <q>Learning Debian GNU/Linux (Aprendendo "
-#~ "Debian GNU/Linux)</q>."
+#~ "Este libro ofrece unha breve guía de instalación de Debian GNU/Linux, o "
+#~ "básico das ordes de Unix ou Linux, configuración básica e mantemento do "
+#~ "sistema e da rede. Configuración do sistema de xanelas X e uso de "
+#~ "multimedia en Debian GNU/Linux. Este libro tamén inclúe unha guía para "
+#~ "mantedores, o que estimula a xente en Corea a converterse en mantedores "
+#~ "oficiais de Debian."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Tres CDs oficiais de Potato r3 e un CD non oficial de Woody"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Unha guía de referencia práctica do sistema Debian GNU/Linux que mostra "
-#~ "en máis de 1.500 <q>receitas</q> como usalo para actividades diarias; "
-#~ "desde traballar con texto, imaxes e son a produtividade e problemas de "
-#~ "rede. Igual que o software que o libro describe, este libro ten "
-#~ "«copyleft» e as fontes están dispoñíbeis."
+#~ "Este libro introduce aos lectores a Debian GNU/Linux con moitos titoriais "
+#~ "prácticos e consellos. Escrito en coreano, este libro cobre todos os "
+#~ "aspectos do sistema Debian GNU/Linux: instalación por primeira vez, "
+#~ "instalación de paquetes, configuración das X, conexión a internet, "
+#~ "mantemento da rede entre outros. Este libro proporciona unha morea de "
+#~ "consellos para configurar Debian para un ambiente en lingua coreana, e "
+#~ "tamén resulta bo para os non iniciados."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Este libro introduce os conceptos e técnicas do sistema operativo Debian, "
-#~ "explicando o seu uso e erros comúns e ilustrando a motivación detrás de "
-#~ "cada unha destas aproximacións. O obxectivo non é ser un libro de "
-#~ "referencia, senón dar ao lector un coñecemento suficiente acerca da forma "
-#~ "de funcionar do proxecto e do sistema operativo para aprender e adoptar "
-#~ "as sofisticadas e elegantes, e as veces pouco intuitivas a primeira "
-#~ "vista, solucións que evolucionaron como parte do sistema Debian ao longo "
-#~ "da pasada década. Inda que está destinado a administradores UNIX/Linux "
-#~ "experimentados, este libro tamén pode servir como un recurso excelente "
-#~ "xunto con unha referencia estándar de Linux para comezar a experiencia "
-#~ "propia en Linux ca filosofía de abaixo a arriba de Debian. "
+#~ "O primeiro libro Persa sobre Debian GNU/Linux. Este libro axúdao a "
+#~ "instalar Debian GNU/Linux e a configurar servizos de rede como webs, "
+#~ "bases de datos, devasas, correos electrónicos, ftp entre outros. Tamén "
+#~ "lle axuda a comezar usando GNU/Linux e o potente sistema de xestión de "
+#~ "paquetes de Debian."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Debian GNU/Linux 3.1r0a «sarge» oficial en DVD (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Este libro está dividido en catro partes: Conceptos básicos, xestión de "
+#~ "GNU/Linux, administración do sistema e operacións avanzadas. Cada "
+#~ "capítulo explica en profundidade as características do sistema operativo. "
+#~ "Os primeiros capítulos explican a estrutura de GNU/Linux. Estes capítulos "
+#~ "axudarán ao lector a entender como fai uso o sistema dos recursos básicos "
+#~ "como o procesador e a memoria. Un análise detallado dos sistemas de "
+#~ "ficheiros ext2, ext3 e ReiserFS capacitarán aos usuarios para facer a "
+#~ "escolla correcta segundo as súas necesidades. Moitas cifras ao longo do "
+#~ "libro mostran aspectos sobre a eficiencia do sistema. Este libro servirá "
+#~ "a estudantes e a calquera que queira aprender GNU/Linux en profundidade. "
+#~ "Este libro basease en Debian Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Tanto principiantes como usuarios avanzados descubrirán que este libro é "
-#~ "unha fonte de información exhaustiva sobre o uso de Debian para "
-#~ "escritorios, servidores de internet e intranet e desenvolvemento. Tamén "
-#~ "contén información básica do proxecto e unha cobertura extensa do sistema "
-#~ "de xestión de paquetes de Debian."
+#~ "Este é o libro ideal para aprender como crear plataformas IT básicas e "
+#~ "complexas usando tan só software libre. Dentro atopará unha ampla "
+#~ "variedade de procedementos revisados e axustados para encaixar na boas "
+#~ "prácticas da implementación de infraestrutura tecnolóxica. Esta guía "
+#~ "exhaustiva e doada de ler levarao da man para acadar obxectivos "
+#~ "específicos co sistema operativo Debian GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live Cd con Knoppix"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
+#~ "var ddp_pkg_loc />."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD de Sarge co instalador e unha selección de paquetes"
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Está dispoñíbel unha <a href=\"http://www.lob.de/cgi-bin/work/"
+#~ "outputexpert?mode=viewone&amp;titnr=254925022\">\n"
+#~ " publicación </a> alternativa en Lehmanns Fachbuchhandlung e custa "
+#~ "29.95\n"
+#~ " euros (en 2008)."
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Este libro é para desenvolvedores que traballan con GNU/Linux en "
+#~ "procesadores ARM. Cobre algúns dispositivos especificamente para "
+#~ "configuracións rápidas (LART, Assabet, Psion5). Tamén dá información, "
+#~ "ferramentas e técnicas xenéricas. A cadea de ferramentas GNU está cuberta "
+#~ "tanto en nativo como en compilación cruzada, así como os cargadores de "
+#~ "arranque, parches do núcleo, discos RAM, particularidades de ARM e outros "
+#~ "recursos de ARM. Tamén inclúe extensiva información titorial acerca do "
+#~ "esencial de GNU/Linux para desenvolvedores que veñen de outras "
+#~ "plataformas. Non é específico de Debian, pero a distribución «Aleph ARM "
+#~ "Linux» está baseada moi de preto en Debian ARM e asúmese que se "
+#~ "traballará en esa distribución e preferiblemente tendo tamén unha máquina "
+#~ "baseada en Debian."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 arquitectura ARM"
diff --git a/galician/po/organization.gl.po b/galician/po/organization.gl.po
index 395d0626601..21a165385f2 100644
--- a/galician/po/organization.gl.po
+++ b/galician/po/organization.gl.po
@@ -74,24 +74,24 @@ msgid "Officers"
msgstr "Dirixentes"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribución"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publicidade"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Asistencia e infraestrutura"
@@ -108,211 +108,211 @@ msgstr "Líder"
msgid "Technical Committee"
msgstr "Comité técnico"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Secretaría"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Proxectos de desenvolvemento"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Arquivos FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Xestores do FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Asistentes do FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Magos do FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Equipo de backports"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Paquetes individuais"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Xestión das publicacións"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Equipo de publicación"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Garantía de calidade"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Equipo do sistema de instalación"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Notas da publicación"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Imaxes de CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produción"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Probas"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infraestrutura de construción automática"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Equipo de peticións de construción"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Administración de buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Documentación"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de paquetes que precisan traballo e por crear"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Equipo do sistema Live"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Adaptacións"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Configuracións especiais"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Portátiles"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Devasas"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Sistemas embebidos"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Contacto coa prensa"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Páxinas web"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Proxecto muller Debian"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Anti-acoso"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Comité técnico"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Programa de socios"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Coordinador das doazóns de hardware"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Asistencia ao usuario"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Sistema de seguimento dos informes de fallos"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administración das listas de correo o dos seus arquivos"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Recepción de novos membros"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Xestores de contas de Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantedores dos chaveiros (PGP e GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Equipo de seguridade"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Páxina de asesores técnicos"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Páxina de vendedores de CDs"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Políticas"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Administración de sistemas"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -321,7 +321,7 @@ msgstr ""
"de Debian, incluídos problemas cos contrasinais ou se precisa que se instale "
"un paquete."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -331,78 +331,96 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador do directorio LDAP de desenvolvedores"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Réplicas"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Mantedor do DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Sistema de seguimento de paquetes"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
#, 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:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Administradores de alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administradores de alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian para nenos de 1 a 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian para práctica e investigación médica"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian para a educación"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian en oficinas legais"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian para persoas con discapacidades"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian para investigación científica e relacionada"
-#~ msgid "Publicity"
-#~ msgstr "Publicidade"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian para a educación"
-#~ msgid "Bits from Debian"
-#~ msgstr "Novas breves de Debian"
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipo de seguridade en testing"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Mantedores do chaveiro de mantedores de Debian (DM)"
+#~ msgid "Security Audit Project"
+#~ msgstr "Proxecto de auditoría de seguridade"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Actual líder do proxecto Debian"
#~ msgid "DebConf chairs"
#~ msgstr "Presidencias DebConf"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Actual líder do proxecto Debian"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Mantedores do chaveiro de mantedores de Debian (DM)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Proxecto de auditoría de seguridade"
+#~ msgid "Bits from Debian"
+#~ msgstr "Novas breves de Debian"
-#~ msgid "Testing Security Team"
-#~ msgstr "Equipo de seguridade en testing"
+#~ msgid "Publicity"
+#~ msgstr "Publicidade"
+
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
+
+#~ 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..2ffd99e46ee 100644
--- a/galician/po/others.gl.po
+++ b/galician/po/others.gl.po
@@ -327,17 +327,17 @@ msgstr "Versión"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "Onde:"
+#~ msgid "Wanted:"
+#~ msgstr "Requirido:"
-#~ msgid "Specifications:"
-#~ msgstr "Especificacións:"
+#~ msgid "Who:"
+#~ msgstr "Quen:"
#~ msgid "Architecture:"
#~ msgstr "Arquitectura:"
-#~ msgid "Who:"
-#~ msgstr "Quen:"
+#~ msgid "Specifications:"
+#~ msgstr "Especificacións:"
-#~ msgid "Wanted:"
-#~ msgstr "Requirido:"
+#~ msgid "Where:"
+#~ msgstr "Onde:"
diff --git a/galician/po/partners.gl.po b/galician/po/partners.gl.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/galician/po/partners.gl.po
+++ b/galician/po/partners.gl.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/galician/po/stats.gl.po b/galician/po/stats.gl.po
index 04248ecc2cf..2bedcc10068 100644
--- a/galician/po/stats.gl.po
+++ b/galician/po/stats.gl.po
@@ -28,79 +28,90 @@ msgstr "Hai %d bytes por traducir."
msgid "There are %d strings to translate."
msgstr "Hai %d cadeas por traducir."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Esta tradución está demasiado desfasada"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "A versión da tradución é incorrecta"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Esta tradución está demasiado desfasada"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "O orixinal é máis recente que esta tradución"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "O orixinal xa non existe"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "non hai número de visitas"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "visitas"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Pulse para obter datos de «diffstat»"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "«diff» unificado"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "«diff» coloreado"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "«diff» coloreado"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Resumo da tradución para o"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Sen traducir"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Desfasado"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Traducido"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Actualizado"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "ficheiros"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -108,131 +119,131 @@ msgstr ""
"Nota: as listas de páxinas están ordenadas por popularidade. Pase por riba "
"do nome da páxina para ver o número de visitas."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Traducións desfasadas"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Ficheiro"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diferenzas"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Comentario"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Rexistro"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Tradución"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Mantedor"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Estado"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Tradutor"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "As páxinas xerais non están traducidas"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Páxinas xerais sen traducir"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "As novas non están traducidas"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Novas non traducidas"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "As páxinas de usuarios/asistentes técnicos non están traducidas"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Páxinas de asistentes técnicos/usuarios non traducidas"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "As páxinas internacionais non están traducidas"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Páxinas internacionais non traducidas"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Páxinas traducidas (actualizadas)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Modelos traducidos (ficheiros PO)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Estatísticas de traducións PO"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Dubidosas"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Sen traducir"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Páxinas web traducidas"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Estatísticas de tradución por número de páxinas"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Idioma"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Traducións"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Páxinas web traducidas (por tamaño)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Estatísticas de tradución por tamaño de páxina"
diff --git a/galician/po/templates.gl.po b/galician/po/templates.gl.po
index 125465c315a..8c69f22f811 100644
--- a/galician/po/templates.gl.po
+++ b/galician/po/templates.gl.po
@@ -204,11 +204,11 @@ msgstr "na versión 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Para informar dun problema co sitio web, mande un correo a <a href=\"mailto:"
"debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. Para obter "
@@ -512,6 +512,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Nota:</em> O documento orixinal de esta tradución xa non existe."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
diff --git a/galician/po/vendors.gl.po b/galician/po/vendors.gl.po
index 1fbfa8cbf3a..6cee01aa45b 100644
--- a/galician/po/vendors.gl.po
+++ b/galician/po/vendors.gl.po
@@ -68,29 +68,29 @@ msgstr "fonte"
msgid "and"
msgstr "e"
-#~ msgid "Architectures:"
-#~ msgstr "Arquitecturas:"
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
-#~ msgid "DVD Type:"
-#~ msgstr "Tipo de DVD"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL da páxina de Debian:"
-#~ msgid "CD Type:"
-#~ msgstr "Tipo de CD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permite contribucións a Debian:"
-#~ msgid "email:"
-#~ msgstr "correo:"
+#~ msgid "Country:"
+#~ msgstr "País:"
#~ msgid "Ship International:"
#~ msgstr "Envíos internacionais:"
-#~ msgid "Country:"
-#~ msgstr "País:"
+#~ msgid "email:"
+#~ msgstr "correo:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Permite contribucións a Debian:"
+#~ msgid "CD Type:"
+#~ msgstr "Tipo de CD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL da páxina de Debian:"
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo de DVD"
-#~ msgid "Vendor:"
-#~ msgstr "Vendedor:"
+#~ msgid "Architectures:"
+#~ msgstr "Arquitecturas:"
diff --git a/german/po/doc.de.po b/german/po/doc.de.po
index 585fe1d8bba..cacd4ef5d56 100644
--- a/german/po/doc.de.po
+++ b/german/po/doc.de.po
@@ -210,13 +210,13 @@ msgstr "(Version <get-var version />)"
msgid "plain text"
msgstr "Reiner Text"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://www."
-"debian.org/doc/cvs\">Subversion</a>-Depot verfügbar."
+"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:156 ../../english/doc/manuals.defs:164
#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
@@ -244,14 +244,6 @@ 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:178
-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:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -282,192 +274,172 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 für ARM-Architektur"
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "Sarge-CD mit Installer und einer Auswahl von Paketen"
+
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live-CD mit Knoppix"
#~ msgid ""
-#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
-#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
-#~ "Psion5).\n"
-#~ " It also gives generic information, tools and techniques. The GNU\n"
-#~ " toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ " includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ " coming from other platforms.\n"
-#~ " It is not specific to Debian, but the Aleph\n"
-#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ " will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ " host machine too."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Dieses Buch ist für Entwickler geeignet, die mit Debian GNU/Linux auf\n"
-#~ " der ARM-Architektur arbeiten. Es bespricht einige Geräte zum\n"
-#~ " schnellen Einrichten (LART, Assabet, Psion5). Es vermittelt ebenfalls\n"
-#~ " allgemeine Informationen, Werkzeuge und Techniken. Die GNU-Toolchain\n"
-#~ " wird als nativer und als Cross-Compiler vorgestellt, genauso wie\n"
-#~ " Bootloader, Kernel-Patches, RAM-Disks, ARM-Feinheiten und andere\n"
-#~ " ARM-Quellen. Es enthält ebenfalls ausführliche Grundlagen über\n"
-#~ " GNU/Linux für Entwickler von anderen Plattformen.\n"
-#~ " Es ist nicht\n"
-#~ " spezifisch für Debian, doch die Aleph-ARMLinux-Distribution basiert\n"
-#~ " sehr stark auf Debian-ARM und es wird angenommen, dass Sie von dieser\n"
-#~ " Distribution aus arbeiten werden und vornehmlich eine weitere\n"
-#~ " Debian-Maschine haben."
+#~ " Anfänger wie auch fortgeschrittene Benutzer werden mit diesem Buch\n"
+#~ " eine umfassende Informationsquelle zur Benutzung von Debian für\n"
+#~ " Desktops, Intranet- und Internet-Server und zur Entwicklung entdecken.\n"
+#~ " Es enthält außerdem Hintergrundinformationen zum Projekt und\n"
+#~ " ausführliche Behandlung von Debians einzigartigem\n"
+#~ " Paketverwaltungssystem."
+
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "Offizielles Debian GNU/Linux 3.1r0a Sarge auf DVD (i386)"
#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Eine alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " Ausgabe</a> von Lehmanns Fachbuchhandlung ist für 29,95 € erhältlich\n"
-#~ " (Stand 2008)."
+#~ "Dieses Buch führt in die Konzepte und Techniken des Debian-"
+#~ "Betriebssystems\n"
+#~ " ein, erklärt ihre Verwendung und Fallstricke und illustriert den\n"
+#~ " Gedankengang hinter jeder der Herangehensweisen. Es hat nicht das "
+#~ "Ziel,\n"
+#~ " ein Nachschlagewerk zu sein, sondern dem Leser genug Einsicht in die\n"
+#~ " Tätigkeiten des Projekts und des Betriebssystems zu geben, um die "
+#~ "technisch\n"
+#~ " ausgefeilten und eleganten, aber manchmal zuerst leicht nicht-"
+#~ "intuitiven\n"
+#~ " Lösungen zu erlernen und sich zu Eigen zu machen, die sich als Teil\n"
+#~ " des Debian-Systems über das letzte Jahrzehnt hinweg entwickelt haben.\n"
+#~ " Obwohl sich das Buch an erfahrene UNIX/Linux-Administratoren richtet, "
+#~ "kann\n"
+#~ " es neben einer Standard-Linux-Referenz auch als hervorragende "
+#~ "Ressource\n"
+#~ " dienen, um seine eigenen Linux-Erfahrungen in Debians\n"
+#~ " Von-unten-nach-oben-Philosophie aus sich selbst heraus entstehen zu "
+#~ "lassen."
#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Verwenden Sie <a href=\"cvs\">SVN</a>, um den SGML-Quelltext für <get-var "
-#~ "ddp_pkg_loc /> herunterzuladen."
-
-#~ msgid "Language:"
-#~ msgstr "Sprache:"
+#~ "Ein aktiv betreutes Referenzhandbuch zum Debian-GNU/Linux-System,\n"
+#~ " das in über 1.500 <q>Rezepten</q> zeigt, wie man es für jedermanns\n"
+#~ " Aktivitäten benutzt &ndash; von Arbeiten mit Texten, Bildern und Audio "
+#~ "bis\n"
+#~ " hin zu Produktivität und Netzwerkthemen. Wie die Software, die das\n"
+#~ " Buch beschreibt, ist das Buch <q>copylefted</q> und sein Quellcode ist "
+#~ "verfügbar."
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Dies ist das richtige Buch für Sie, um zu lernen, wie man grundsätzliche "
-#~ "und komplexe IT-Plattformen nur mit Freier Software erstellt. Darin "
-#~ "finden Sie eine breite Spanne von Prozeduren, die für die besten Methoden "
-#~ "zur Implementierung von technologischer Infrastruktur kontrolliert und "
-#~ "angepasst wurden. Diese einfach zu lesende und umfassende Anleitung nimmt "
-#~ "Sie an die Hand, um spezifische Ziele mit dem Debian GNU/Linux-"
-#~ "Betriebssystem zu erreichen."
+#~ "Learning Debian GNU/Linux führt den neuen Benutzer von Linux\n"
+#~ " durch die Installation und Konfiguration von Debian\n"
+#~ " GNU/Linux. Windows-Benutzer werden in diesem Buch durch eine leichte\n"
+#~ " Einführung in diese spannende Computer-Welt geführt, von Bill McCarty\n"
+#~ " in <q>Learning Debian GNU/Linux</q>."
+
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Dieses Buch ist in vier Teile eingeteilt: grundlegende Konzepte, "
-#~ "Verwaltung\n"
-#~ " von GNU/Linux, Administration des Systems und fortgeschrittener "
-#~ "Betrieb. Jedes\n"
-#~ " Kapitel erklärt ausführlich die Funktionen des Betriebssystems. Die "
-#~ "ersten\n"
-#~ " Kapitel helfen dem Leser zu verstehen, wie das System grundlegende "
-#~ "Ressourcen\n"
-#~ " wie den Prozessor und Speicher verwendet. Eine detailliertere Analyse "
+#~ "Umfasst mehr als 230 Seiten und drei CD-ROMs. Die behandelten Themen "
#~ "über\n"
-#~ " Dateisysteme wie Ext2, Ext3 und ReiserFS ermöglicht es den Benutzern, "
-#~ "die\n"
-#~ " für ihre Bedürfnisse korrekte Wahl zu treffen. Viele Abbildungen im "
-#~ "ganzen\n"
-#~ " Buch zeigen Aspekte der Leistung des Systems. Dieses Buch zielt auf\n"
-#~ " Hochschulstudenten und jeden, der GNU/Linux eingehend lernen möchte, "
-#~ "ab.\n"
-#~ " Dieses Buch behandelt Debian Sarge."
+#~ " Software enthalten Debian, Linux, Netzwerk, Programmierungswerkzeuge, "
+#~ "GUI,\n"
+#~ " computerunterstütztes Publizieren, Business, lustige Dinge, und "
+#~ "Multimedia.\n"
+#~ " 30 Tage gratis E-Mail-Unterstützung inbegriffen."
-#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
-#~ msgstr ""
-#~ "Das erste Buch in persischer Sprache über Debian GNU/Linux. Dieses\n"
-#~ " Buch hilft Ihnen, Debian GNU/Linux zu installieren und damit\n"
-#~ " Netzwerkdienste wie Web, Datenbank, Firewall, E-Mail, FTP etc.\n"
-#~ " einzurichten. Außerdem werden Ihnen Hilfestellungen bei der\n"
-#~ " Verwendung von GNU/Linux und Debians mächtigem Paketverwaltungssystem\n"
-#~ " gegeben."
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 Ausgaben: Eine ohne und eine mit zwei DVDs (i386)"
+
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Architektur (i386 und amd64) auf DVD"
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Dieses Buch führt die Leser mit vielen Tutorials und Tipps zu Debian\n"
-#~ " GNU/Linux. Das Buch ist auf Koreanisch geschrieben, es behandelt\n"
-#~ " viele Aspekte eines Debian-GNU/Linux-Systems: erstes Einrichten,\n"
-#~ " Paket-Installation, X konfigurieren, Verbindung zum Internet,\n"
-#~ " Netzwerk-Wartung und mehr. Das Buch bietet eine Reihe von Tipps für\n"
-#~ " die Einrichtung von Debian für eine koreanische Sprachumgebung und\n"
-#~ " ist für Einsteiger ebenfalls gut geeignet."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Drei offizielle Potato r3 CDs und eine inoffizielle Woody CD"
+#~ "2 Ausgaben: Eine ohne CD, die andere mit offiziellen CDs (i386, contrib "
+#~ "und Quelltexte)"
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
+#~ " PC based hardware, including important applications like the X Window\n"
+#~ " System, window managers and desktop environments (KDE, GNOME) and a\n"
+#~ " selection of important system services. Unix/Linux basics and\n"
+#~ " concepts together with system usage and important components (bash,\n"
+#~ " system services and important commands) are introduced.\n"
+#~ " There is an explanation of Debian's package format and how to create\n"
+#~ " packages in this format. It also includes an overview of standard "
+#~ "Linux\n"
+#~ " applications (networking, software development, LaTeX and office\n"
+#~ " suites). Strong emphasis is on networking and system\n"
+#~ " administration issues, like planing and building of a dial-in router "
+#~ "or\n"
+#~ " a server for Windows based clients (Samba)."
#~ msgstr ""
-#~ "Dieses Buch gibt eine kurze Anleitung zum Installieren von Debian GNU/"
-#~ "Linux,\n"
-#~ " Grundlagen von Unix- oder Linux-Befehlen, Basis-Konfiguration und\n"
-#~ " Instandhaltung des Systems und Netzwerks mit Debian GNU/Linux, X "
-#~ "Window\n"
-#~ " System Konfiguration, und Benutzung von Multimedia in Debian GNU/Linux "
-#~ "in\n"
-#~ " Koreanisch. Dieses Buch behandelt ebenfalls das Betreuer-Handbuch, das "
-#~ "Leute\n"
-#~ " in Korea dazu anregt, offizieller Debian-Betreuer zu werden."
+#~ "Dieses Buch enthält alle Schritte zur Planung und Installation von\n"
+#~ " Debian GNU/Linux auf einem PC, wobei es auf wichtige Programme wie\n"
+#~ " X Window System, Window-Manager und Desktop-Umgebungen (KDE und GNOME)\n"
+#~ " sowie einer Auswahl der wichtigen Systemdiensten eingeht. Weiterhin\n"
+#~ " werden UNIX/Linux-Grundlagen und wichtige Komponenten (bash,\n"
+#~ " Systemdienste und wichtige Kommandos) vorgestellt.\n"
+#~ " Es gibt außerdem eine Erläuterung des Debian-Paketformats und wie\n"
+#~ " man Pakete erstellt. Weiterhin enthält es einen\n"
+#~ " Überblick über die Standard-GNU/Linux-Applikationen (Netzwerk,\n"
+#~ " Software-Entwicklung, LaTeX und Office-Pakete). Besonderen Wert\n"
+#~ " wird auf Netzwerk- und Systemadministrations-Bereiche gelegt, wie\n"
+#~ " z.B. Planung und Aufbau eines Einwahlservers und eines Servers\n"
+#~ " für Windows-Rechner (Samba)."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 inoffizielle Woody, 3 Potato rev0"
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge Installer (single-width CD)"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "Dieses Buch behandelt allgemeine Themen von Debian GNU/Linux: "
-#~ "Installation, APT und dpkg, die Kommandozeile, das X-Window-System, "
-#~ "Netzwerke, Systemadministration, Einrichten des Kernels, Dateien mit "
-#~ "Windows teilen, Server aufbauen und so weiter. Mit den speziell "
-#~ "angefertigten CDs sind Sie in der Lage, sehr einfach eine auf japanische "
-#~ "Bedürfnisse ausgerichtete Version von Debian GNU/Linux zu installieren "
-#~ "und zu benutzen."
+#~ "Dieses Buch ist im Wörterbuch-Stil gehalten und beinhaltet verschiedene\n"
+#~ " Tipps für Anfänger und fortgeschrittene Anfänger unter den Benutzern;\n"
+#~ " Installation auf verschiedenen Wegen, Desktop-Anpassung, Finden und\n"
+#~ " Beseitigen von Problemen, nutzbringendes Know-how, und so weiter."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 Author's Edition (3 CDs)"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, Edition des Autors (DVD + CD)"
#~ msgid ""
#~ "This is the latest book for Sarge of the series that has been\n"
@@ -491,169 +463,196 @@ msgstr "PDF"
#~ "Fortgeschrittenen\n"
#~ " Benutzer hilfreich sein."
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, Edition des Autors (DVD + CD)"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 Author's Edition (3 CDs)"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Dieses Buch ist im Wörterbuch-Stil gehalten und beinhaltet verschiedene\n"
-#~ " Tipps für Anfänger und fortgeschrittene Anfänger unter den Benutzern;\n"
-#~ " Installation auf verschiedenen Wegen, Desktop-Anpassung, Finden und\n"
-#~ " Beseitigen von Problemen, nutzbringendes Know-how, und so weiter."
+#~ "Dieses Buch behandelt allgemeine Themen von Debian GNU/Linux: "
+#~ "Installation, APT und dpkg, die Kommandozeile, das X-Window-System, "
+#~ "Netzwerke, Systemadministration, Einrichten des Kernels, Dateien mit "
+#~ "Windows teilen, Server aufbauen und so weiter. Mit den speziell "
+#~ "angefertigten CDs sind Sie in der Lage, sehr einfach eine auf japanische "
+#~ "Bedürfnisse ausgerichtete Version von Debian GNU/Linux zu installieren "
+#~ "und zu benutzen."
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge Installer (single-width CD)"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 inoffizielle Woody, 3 Potato rev0"
#~ msgid ""
-#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
-#~ " PC based hardware, including important applications like the X Window\n"
-#~ " System, window managers and desktop environments (KDE, GNOME) and a\n"
-#~ " selection of important system services. Unix/Linux basics and\n"
-#~ " concepts together with system usage and important components (bash,\n"
-#~ " system services and important commands) are introduced.\n"
-#~ " There is an explanation of Debian's package format and how to create\n"
-#~ " packages in this format. It also includes an overview of standard "
-#~ "Linux\n"
-#~ " applications (networking, software development, LaTeX and office\n"
-#~ " suites). Strong emphasis is on networking and system\n"
-#~ " administration issues, like planing and building of a dial-in router "
-#~ "or\n"
-#~ " a server for Windows based clients (Samba)."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "Dieses Buch enthält alle Schritte zur Planung und Installation von\n"
-#~ " Debian GNU/Linux auf einem PC, wobei es auf wichtige Programme wie\n"
-#~ " X Window System, Window-Manager und Desktop-Umgebungen (KDE und GNOME)\n"
-#~ " sowie einer Auswahl der wichtigen Systemdiensten eingeht. Weiterhin\n"
-#~ " werden UNIX/Linux-Grundlagen und wichtige Komponenten (bash,\n"
-#~ " Systemdienste und wichtige Kommandos) vorgestellt.\n"
-#~ " Es gibt außerdem eine Erläuterung des Debian-Paketformats und wie\n"
-#~ " man Pakete erstellt. Weiterhin enthält es einen\n"
-#~ " Überblick über die Standard-GNU/Linux-Applikationen (Netzwerk,\n"
-#~ " Software-Entwicklung, LaTeX und Office-Pakete). Besonderen Wert\n"
-#~ " wird auf Netzwerk- und Systemadministrations-Bereiche gelegt, wie\n"
-#~ " z.B. Planung und Aufbau eines Einwahlservers und eines Servers\n"
-#~ " für Windows-Rechner (Samba)."
+#~ "Dieses Buch gibt eine kurze Anleitung zum Installieren von Debian GNU/"
+#~ "Linux,\n"
+#~ " Grundlagen von Unix- oder Linux-Befehlen, Basis-Konfiguration und\n"
+#~ " Instandhaltung des Systems und Netzwerks mit Debian GNU/Linux, X "
+#~ "Window\n"
+#~ " System Konfiguration, und Benutzung von Multimedia in Debian GNU/Linux "
+#~ "in\n"
+#~ " Koreanisch. Dieses Buch behandelt ebenfalls das Betreuer-Handbuch, das "
+#~ "Leute\n"
+#~ " in Korea dazu anregt, offizieller Debian-Betreuer zu werden."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Drei offizielle Potato r3 CDs und eine inoffizielle Woody CD"
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "2 Ausgaben: Eine ohne CD, die andere mit offiziellen CDs (i386, contrib "
-#~ "und Quelltexte)"
-
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Architektur (i386 und amd64) auf DVD"
+#~ "Dieses Buch führt die Leser mit vielen Tutorials und Tipps zu Debian\n"
+#~ " GNU/Linux. Das Buch ist auf Koreanisch geschrieben, es behandelt\n"
+#~ " viele Aspekte eines Debian-GNU/Linux-Systems: erstes Einrichten,\n"
+#~ " Paket-Installation, X konfigurieren, Verbindung zum Internet,\n"
+#~ " Netzwerk-Wartung und mehr. Das Buch bietet eine Reihe von Tipps für\n"
+#~ " die Einrichtung von Debian für eine koreanische Sprachumgebung und\n"
+#~ " ist für Einsteiger ebenfalls gut geeignet."
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 Ausgaben: Eine ohne und eine mit zwei DVDs (i386)"
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid ""
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
+#~ msgstr ""
+#~ "Das erste Buch in persischer Sprache über Debian GNU/Linux. Dieses\n"
+#~ " Buch hilft Ihnen, Debian GNU/Linux zu installieren und damit\n"
+#~ " Netzwerkdienste wie Web, Datenbank, Firewall, E-Mail, FTP etc.\n"
+#~ " einzurichten. Außerdem werden Ihnen Hilfestellungen bei der\n"
+#~ " Verwendung von GNU/Linux und Debians mächtigem Paketverwaltungssystem\n"
+#~ " gegeben."
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
#~ msgstr ""
-#~ "Umfasst mehr als 230 Seiten und drei CD-ROMs. Die behandelten Themen "
+#~ "Dieses Buch ist in vier Teile eingeteilt: grundlegende Konzepte, "
+#~ "Verwaltung\n"
+#~ " von GNU/Linux, Administration des Systems und fortgeschrittener "
+#~ "Betrieb. Jedes\n"
+#~ " Kapitel erklärt ausführlich die Funktionen des Betriebssystems. Die "
+#~ "ersten\n"
+#~ " Kapitel helfen dem Leser zu verstehen, wie das System grundlegende "
+#~ "Ressourcen\n"
+#~ " wie den Prozessor und Speicher verwendet. Eine detailliertere Analyse "
#~ "über\n"
-#~ " Software enthalten Debian, Linux, Netzwerk, Programmierungswerkzeuge, "
-#~ "GUI,\n"
-#~ " computerunterstütztes Publizieren, Business, lustige Dinge, und "
-#~ "Multimedia.\n"
-#~ " 30 Tage gratis E-Mail-Unterstützung inbegriffen."
-
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ " Dateisysteme wie Ext2, Ext3 und ReiserFS ermöglicht es den Benutzern, "
+#~ "die\n"
+#~ " für ihre Bedürfnisse korrekte Wahl zu treffen. Viele Abbildungen im "
+#~ "ganzen\n"
+#~ " Buch zeigen Aspekte der Leistung des Systems. Dieses Buch zielt auf\n"
+#~ " Hochschulstudenten und jeden, der GNU/Linux eingehend lernen möchte, "
+#~ "ab.\n"
+#~ " Dieses Buch behandelt Debian Sarge."
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Learning Debian GNU/Linux führt den neuen Benutzer von Linux\n"
-#~ " durch die Installation und Konfiguration von Debian\n"
-#~ " GNU/Linux. Windows-Benutzer werden in diesem Buch durch eine leichte\n"
-#~ " Einführung in diese spannende Computer-Welt geführt, von Bill McCarty\n"
-#~ " in <q>Learning Debian GNU/Linux</q>."
+#~ "Dies ist das richtige Buch für Sie, um zu lernen, wie man grundsätzliche "
+#~ "und komplexe IT-Plattformen nur mit Freier Software erstellt. Darin "
+#~ "finden Sie eine breite Spanne von Prozeduren, die für die besten Methoden "
+#~ "zur Implementierung von technologischer Infrastruktur kontrolliert und "
+#~ "angepasst wurden. Diese einfach zu lesende und umfassende Anleitung nimmt "
+#~ "Sie an die Hand, um spezifische Ziele mit dem Debian GNU/Linux-"
+#~ "Betriebssystem zu erreichen."
+
+#~ msgid "Language:"
+#~ msgstr "Sprache:"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
#~ msgstr ""
-#~ "Ein aktiv betreutes Referenzhandbuch zum Debian-GNU/Linux-System,\n"
-#~ " das in über 1.500 <q>Rezepten</q> zeigt, wie man es für jedermanns\n"
-#~ " Aktivitäten benutzt &ndash; von Arbeiten mit Texten, Bildern und Audio "
-#~ "bis\n"
-#~ " hin zu Produktivität und Netzwerkthemen. Wie die Software, die das\n"
-#~ " Buch beschreibt, ist das Buch <q>copylefted</q> und sein Quellcode ist "
-#~ "verfügbar."
+#~ "Verwenden Sie <a href=\"cvs\">SVN</a>, um den SGML-Quelltext für <get-var "
+#~ "ddp_pkg_loc /> herunterzuladen."
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
#~ msgstr ""
-#~ "Dieses Buch führt in die Konzepte und Techniken des Debian-"
-#~ "Betriebssystems\n"
-#~ " ein, erklärt ihre Verwendung und Fallstricke und illustriert den\n"
-#~ " Gedankengang hinter jeder der Herangehensweisen. Es hat nicht das "
-#~ "Ziel,\n"
-#~ " ein Nachschlagewerk zu sein, sondern dem Leser genug Einsicht in die\n"
-#~ " Tätigkeiten des Projekts und des Betriebssystems zu geben, um die "
-#~ "technisch\n"
-#~ " ausgefeilten und eleganten, aber manchmal zuerst leicht nicht-"
-#~ "intuitiven\n"
-#~ " Lösungen zu erlernen und sich zu Eigen zu machen, die sich als Teil\n"
-#~ " des Debian-Systems über das letzte Jahrzehnt hinweg entwickelt haben.\n"
-#~ " Obwohl sich das Buch an erfahrene UNIX/Linux-Administratoren richtet, "
-#~ "kann\n"
-#~ " es neben einer Standard-Linux-Referenz auch als hervorragende "
-#~ "Ressource\n"
-#~ " dienen, um seine eigenen Linux-Erfahrungen in Debians\n"
-#~ " Von-unten-nach-oben-Philosophie aus sich selbst heraus entstehen zu "
-#~ "lassen."
-
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Offizielles Debian GNU/Linux 3.1r0a Sarge auf DVD (i386)"
+#~ "Eine alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " Ausgabe</a> von Lehmanns Fachbuchhandlung ist für 29,95 € erhältlich\n"
+#~ " (Stand 2008)."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
#~ msgstr ""
-#~ " Anfänger wie auch fortgeschrittene Benutzer werden mit diesem Buch\n"
-#~ " eine umfassende Informationsquelle zur Benutzung von Debian für\n"
-#~ " Desktops, Intranet- und Internet-Server und zur Entwicklung entdecken.\n"
-#~ " Es enthält außerdem Hintergrundinformationen zum Projekt und\n"
-#~ " ausführliche Behandlung von Debians einzigartigem\n"
-#~ " Paketverwaltungssystem."
+#~ "Dieses Buch ist für Entwickler geeignet, die mit Debian GNU/Linux auf\n"
+#~ " der ARM-Architektur arbeiten. Es bespricht einige Geräte zum\n"
+#~ " schnellen Einrichten (LART, Assabet, Psion5). Es vermittelt ebenfalls\n"
+#~ " allgemeine Informationen, Werkzeuge und Techniken. Die GNU-Toolchain\n"
+#~ " wird als nativer und als Cross-Compiler vorgestellt, genauso wie\n"
+#~ " Bootloader, Kernel-Patches, RAM-Disks, ARM-Feinheiten und andere\n"
+#~ " ARM-Quellen. Es enthält ebenfalls ausführliche Grundlagen über\n"
+#~ " GNU/Linux für Entwickler von anderen Plattformen.\n"
+#~ " Es ist nicht\n"
+#~ " spezifisch für Debian, doch die Aleph-ARMLinux-Distribution basiert\n"
+#~ " sehr stark auf Debian-ARM und es wird angenommen, dass Sie von dieser\n"
+#~ " Distribution aus arbeiten werden und vornehmlich eine weitere\n"
+#~ " Debian-Maschine haben."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live-CD mit Knoppix"
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 für ARM-Architektur"
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "Sarge-CD mit Installer und einer Auswahl von Paketen"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://"
+#~ "www.debian.org/doc/cvs\">Subversion</a>-Depot verfügbar."
diff --git a/german/po/mailinglists.de.po b/german/po/mailinglists.de.po
index 42711623927..cc30f37bdbe 100644
--- a/german/po/mailinglists.de.po
+++ b/german/po/mailinglists.de.po
@@ -136,8 +136,8 @@ msgstr "offen"
msgid "closed"
msgstr "geschlossen"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Bitte wählen Sie die Listen, die Sie abonnieren möchten:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Bitte wählen Sie die Listen, die Sie abbestellen möchten:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Bitte wählen Sie die Listen, die Sie abonnieren möchten:"
diff --git a/german/po/organization.de.po b/german/po/organization.de.po
index f4c78672f02..9a7bc3d5385 100644
--- a/german/po/organization.de.po
+++ b/german/po/organization.de.po
@@ -399,47 +399,47 @@ msgstr "Debian für die Wissenschaft und zugehörige Forschung"
msgid "Debian for astronomy"
msgstr "Debian für Astronomie"
-#~ msgid "Auditor"
-#~ msgstr "Kassenprüfer"
+#~ msgid "Publicity"
+#~ msgstr "Öffentlichkeitsarbeit"
-#~ msgid "Live System Team"
-#~ msgstr "Live-System-Team"
+#~ msgid "Bits from Debian"
+#~ msgstr "Neuigkeiten von Debian"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "derzeitiger Debian-Projektleiter"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Schlüsselring-Betreuer für Debian-Betreuer (DM)"
-#~ msgid "Testing Security Team"
-#~ msgstr "Testing-Sicherheitsteam"
+#~ msgid "DebConf chairs"
+#~ msgstr "DebConf-Leitung"
-#~ msgid "Security Audit Project"
-#~ msgstr "Sicherheits-Audit-Projekt"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (nicht aktiv: wurde nicht mit Squeeze veröffentlicht)"
-#~ msgid "Volatile Team"
-#~ msgstr "Volatile-Team"
+#~ msgid "Vendors"
+#~ msgstr "Distributoren"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Schlüssel-Signierungs-Koordination"
+#~ msgid "Handhelds"
+#~ msgstr "Handheldcomputer"
#~ msgid "Marketing Team"
#~ msgstr "Marketing-Team"
-#~ msgid "Handhelds"
-#~ msgstr "Handheldcomputer"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Schlüssel-Signierungs-Koordination"
-#~ msgid "Vendors"
-#~ msgstr "Distributoren"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatile-Team"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (nicht aktiv: wurde nicht mit Squeeze veröffentlicht)"
+#~ msgid "Security Audit Project"
+#~ msgstr "Sicherheits-Audit-Projekt"
-#~ msgid "DebConf chairs"
-#~ msgstr "DebConf-Leitung"
+#~ msgid "Testing Security Team"
+#~ msgstr "Testing-Sicherheitsteam"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Schlüsselring-Betreuer für Debian-Betreuer (DM)"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "derzeitiger Debian-Projektleiter"
-#~ msgid "Bits from Debian"
-#~ msgstr "Neuigkeiten von Debian"
+#~ msgid "Live System Team"
+#~ msgstr "Live-System-Team"
-#~ msgid "Publicity"
-#~ msgstr "Öffentlichkeitsarbeit"
+#~ msgid "Auditor"
+#~ msgstr "Kassenprüfer"
diff --git a/german/po/others.de.po b/german/po/others.de.po
index e83609cf9b8..173fcaf435d 100644
--- a/german/po/others.de.po
+++ b/german/po/others.de.po
@@ -336,17 +336,17 @@ msgstr "Version"
msgid "URL"
msgstr "Links"
-#~ msgid "Wanted:"
-#~ msgstr "Benötigt:"
+#~ msgid "Where:"
+#~ msgstr "Wo:"
-#~ msgid "Who:"
-#~ msgstr "Wer:"
+#~ msgid "Specifications:"
+#~ msgstr "Spezifikationen:"
#~ msgid "Architecture:"
#~ msgstr "Architektur:"
-#~ msgid "Specifications:"
-#~ msgstr "Spezifikationen:"
+#~ msgid "Who:"
+#~ msgstr "Wer:"
-#~ msgid "Where:"
-#~ msgstr "Wo:"
+#~ msgid "Wanted:"
+#~ msgstr "Benötigt:"
diff --git a/german/po/ports.de.po b/german/po/ports.de.po
index f0d6ad93949..9c1484cc8b2 100644
--- a/german/po/ports.de.po
+++ b/german/po/ports.de.po
@@ -118,32 +118,32 @@ msgstr "Debian für PowerPC"
msgid "Debian for Sparc"
msgstr "Debian für Sparc"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian für AMD64"
-
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian für ARM"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian für Laptops"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian für Beowulf"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian für Sparc64"
-#~ msgid "Main"
-#~ msgstr "Hauptseite"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian für S/390"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian für MIPS"
#~ msgid "Debian for Motorola 680x0"
#~ msgstr "Debian für Motorola 680x0"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian für MIPS"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian für S/390"
+#~ msgid "Main"
+#~ msgstr "Hauptseite"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian für Sparc64"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian für Beowulf"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian für Laptops"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian für ARM"
+
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian für AMD64"
diff --git a/german/po/stats.de.po b/german/po/stats.de.po
index 713cd1cd426..41bcf52d124 100644
--- a/german/po/stats.de.po
+++ b/german/po/stats.de.po
@@ -30,79 +30,90 @@ msgstr "Es sind %d Byte zu übersetzen."
msgid "There are %d strings to translate."
msgstr "Es sind %d Zeichenketten zu übersetzen."
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
-msgstr "Diese Übersetzung ist zu alt"
-
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Falsche Version übersetzt"
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Diese Übersetzung ist zu alt"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Das Original ist aktueller als diese Übersetzung"
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Das Original existiert nicht mehr"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "Keine Zugriffszahlen"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "Zugriffe"
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Klicken Sie, um diffstat-Daten zu erhalten"
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Einheitliche Unterschiede"
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Farbige Unterschiede"
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Farbige Unterschiede"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Erstellt mit <transstatslink>"
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Zusammenfassung der Übersetzung für"
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Nicht übersetzt"
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Veraltet"
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Übersetzt"
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Aktuell"
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "Dateien"
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "Byte"
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -111,139 +122,139 @@ msgstr ""
"sortiert. Bewegen Sie den Mauszeiger auf den Seitennamen, um die Anzahl der "
"Zugriffe zu sehen."
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Veraltete Übersetzungen"
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Datei"
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Unterschiede"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Kommentar"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Protokoll"
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Übersetzung"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Betreuer"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Übersetzer"
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Datum"
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Allgemeine Seiten, die nicht übersetzt sind"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Nicht übersetzte allgemeine Seiten"
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Nachrichten, die nicht übersetzt sind"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Nicht übersetzte Nachrichten"
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Berater-/Benutzerseiten, die nicht übersetzt sind"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Nicht übersetzte Berater-/Benutzerseiten"
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Internationale Seiten, die nicht übersetzt sind"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Nicht übersetzte internationale Seiten"
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Übersetzte Seiten (aktuell)"
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Übersetzte Vorlagen (PO-Dateien)"
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Statistik der PO-Übersetzung"
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Ungenau"
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Nicht übersetzt"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Insgesamt"
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Insgesamt:"
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Übersetzte Webseiten"
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Übersetzungsstatistik nach der Seitenanzahl"
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Sprache"
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Übersetzungen"
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Übersetzte Webseiten (nach Größe)"
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Übersetzungsstatistik nach der Seitengröße"
-#~ msgid "Created with"
-#~ msgstr "Erzeugt mit"
+#~ msgid "Hit data from %s, gathered %s."
+#~ msgstr "Zugriffsdaten von %s, erfasst am %s."
#~ msgid "Origin"
#~ msgstr "Original"
-#~ msgid "Hit data from %s, gathered %s."
-#~ msgstr "Zugriffsdaten von %s, erfasst am %s."
+#~ msgid "Created with"
+#~ msgstr "Erzeugt mit"
diff --git a/german/po/templates.de.po b/german/po/templates.de.po
index 0af897a7eae..9a25dcbb160 100644
--- a/german/po/templates.de.po
+++ b/german/po/templates.de.po
@@ -201,12 +201,19 @@ msgstr "in Version 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Um Probleme mit der Website zu melden, schreiben Sie bitte eine E-Mail auf "
"Englisch an unsere öffentlich archivierte Mailingliste <a href=\"mailto:"
@@ -508,6 +515,10 @@ msgid ""
msgstr ""
"<em>Bemerkung:</em> Das Original dieser Übersetzung existiert nicht mehr."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -516,26 +527,26 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Zurück zur Seite »<a href=\"../\">Wer verwendet Debian?</a>«."
-#~ msgid "Select a server near you"
-#~ msgstr "Wählen Sie einen Server in Ihrer Nähe"
-
-#~ msgid "Report it!"
-#~ msgstr "Melden Sie es!"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Besuchen Sie unseren Sponsor"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Haben Sie ein Problem im Layout der Site entdeckt?"
+#~ msgid "More information:"
+#~ msgstr "Weitere Informationen:"
-#~ msgid "Rating:"
-#~ msgstr "Bewertung:"
+#~ msgid "Taken by:"
+#~ msgstr "Übernommen von:"
#~ msgid "Nobody"
#~ msgstr "Niemandem"
-#~ msgid "Taken by:"
-#~ msgstr "Übernommen von:"
+#~ msgid "Rating:"
+#~ msgstr "Bewertung:"
-#~ msgid "More information:"
-#~ msgstr "Weitere Informationen:"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Haben Sie ein Problem im Layout der Site entdeckt?"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Besuchen Sie unseren Sponsor"
+#~ msgid "Report it!"
+#~ msgstr "Melden Sie es!"
+
+#~ msgid "Select a server near you"
+#~ msgstr "Wählen Sie einen Server in Ihrer Nähe"
diff --git a/german/po/vendors.de.po b/german/po/vendors.de.po
index 6f36c856bb7..3d28d9ac764 100644
--- a/german/po/vendors.de.po
+++ b/german/po/vendors.de.po
@@ -69,39 +69,39 @@ msgstr "Quellcode"
msgid "and"
msgstr "und"
-#~ msgid "Architectures:"
-#~ msgstr "Architekturen:"
+#~ msgid "Vendor:"
+#~ msgstr "Distributor:"
-#, fuzzy
-#~| msgid "CD Type:"
-#~ msgid "USB Type:"
-#~ msgstr "Art der CD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL der Debian-Seite:"
-#, fuzzy
-#~| msgid "CD Type:"
-#~ msgid "BD Type:"
-#~ msgstr "Art der CD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Erlaubt eine Spende an Debian:"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD-Typ:"
+#~ msgid "Country:"
+#~ msgstr "Land:"
-#~ msgid "CD Type:"
-#~ msgstr "Art der CD:"
+#~ msgid "Ship International:"
+#~ msgstr "Versand ins Ausland:"
#~ msgid "email:"
#~ msgstr "E-Mail:"
-#~ msgid "Ship International:"
-#~ msgstr "Versand ins Ausland:"
+#~ msgid "CD Type:"
+#~ msgstr "Art der CD:"
-#~ msgid "Country:"
-#~ msgstr "Land:"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-Typ:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Erlaubt eine Spende an Debian:"
+#, fuzzy
+#~| msgid "CD Type:"
+#~ msgid "BD Type:"
+#~ msgstr "Art der CD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL der Debian-Seite:"
+#, fuzzy
+#~| msgid "CD Type:"
+#~ msgid "USB Type:"
+#~ msgstr "Art der CD:"
-#~ msgid "Vendor:"
-#~ msgstr "Distributor:"
+#~ msgid "Architectures:"
+#~ msgstr "Architekturen:"
diff --git a/greek/po/blends.el.po b/greek/po/blends.el.po
index 64b8c15bf29..b00934651af 100644
--- a/greek/po/blends.el.po
+++ b/greek/po/blends.el.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/greek/po/bugs.el.po b/greek/po/bugs.el.po
index 72886e11979..478ba76fa25 100644
--- a/greek/po/bugs.el.po
+++ b/greek/po/bugs.el.po
@@ -167,146 +167,146 @@ msgstr "παλαιότερα προβλήματα"
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "Exclude tag:"
-#~ msgstr "Χωρίς ετικέτα:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Συμπεριλαμβάνει ετικέτα:"
+#~ msgid "Flags:"
+#~ msgstr "Σημάνσεις:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "ενεργά προβλήματα"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "εμφάνισε τα συγχωνευμένα σφάλματα μια φορά"
-#~ msgid "wontfix"
-#~ msgstr "χωρίς λύση"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "χωρίς ταξινόμηση ανα κατάσταση ή σοβαρότητα"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "χωρίς εμφάνιση περιεχομένων στην κεφαλίδα"
-#~ msgid "unreproducible"
-#~ msgstr "μη επαναλαμβανόμενο"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "χωρίς εμφάνιση στατιστικών στο υποσέλιδο"
-#~ msgid "security"
-#~ msgstr "ασφάλεια"
+#~ msgid "proposed-updates"
+#~ msgstr "προτεινόμενες ενημερώσεις"
-#~ msgid "patch"
-#~ msgstr "εππίραμα"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "προτεινόμενες ενημερώσεις δοκιμαστικού"
-#~ msgid "moreinfo"
-#~ msgstr "περισσότερα"
+#~ msgid "Package version:"
+#~ msgstr "Έκδοση πακέτου"
-#~ msgid "l10n"
-#~ msgstr "τοπικοποίηση"
+#~ msgid "Distribution:"
+#~ msgstr "Διανομή:"
-#~ msgid "help"
-#~ msgstr "βοήθεια"
+#~ msgid "bugs"
+#~ msgstr "προβλήματα"
-#~ msgid "fixed-upstream"
-#~ msgstr "διορθωμένο upstream"
+#~ msgid "open"
+#~ msgstr "ανοιχτό"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "διορθωμένο στο πειραματικό"
+#~ msgid "forwarded"
+#~ msgstr "προωθημένο"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "εκκρεμές"
-#~ msgid "confirmed"
-#~ msgstr "επιβεβαιωμένο"
+#~ msgid "fixed"
+#~ msgstr "διορθωμένο"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "έτοιμο"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Συμπεριέλαβε κατάσταση:"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "Exclude status:"
+#~ msgstr "Άνευ κατάστασης:"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "critical"
+#~ msgstr "κρίσιμο"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "grave"
+#~ msgstr "σοβαρότατο"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "serious"
+#~ msgstr "σοβαρό"
-#~ msgid "Exclude severity:"
-#~ msgstr "Άνευ σοβαρότητας:"
+#~ msgid "important"
+#~ msgstr "σημαντικό"
-#~ msgid "Include severity:"
-#~ msgstr "Συμπεριέλαβε σοβαρότητα:"
+#~ msgid "minor"
+#~ msgstr "ασήμαντο"
#~ msgid "wishlist"
#~ msgstr "επιθυμία"
-#~ msgid "minor"
-#~ msgstr "ασήμαντο"
+#~ msgid "Include severity:"
+#~ msgstr "Συμπεριέλαβε σοβαρότητα:"
-#~ msgid "important"
-#~ msgstr "σημαντικό"
+#~ msgid "Exclude severity:"
+#~ msgstr "Άνευ σοβαρότητας:"
-#~ msgid "serious"
-#~ msgstr "σοβαρό"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "grave"
-#~ msgstr "σοβαρότατο"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "critical"
-#~ msgstr "κρίσιμο"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Άνευ κατάστασης:"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "Include status:"
-#~ msgstr "Συμπεριέλαβε κατάσταση:"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "done"
-#~ msgstr "έτοιμο"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "διορθωμένο"
+#~ msgid "confirmed"
+#~ msgstr "επιβεβαιωμένο"
-#~ msgid "pending"
-#~ msgstr "εκκρεμές"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "προωθημένο"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "διορθωμένο στο πειραματικό"
-#~ msgid "open"
-#~ msgstr "ανοιχτό"
+#~ msgid "fixed-upstream"
+#~ msgstr "διορθωμένο upstream"
-#~ msgid "bugs"
-#~ msgstr "προβλήματα"
+#~ msgid "help"
+#~ msgstr "βοήθεια"
-#~ msgid "Distribution:"
-#~ msgstr "Διανομή:"
+#~ msgid "l10n"
+#~ msgstr "τοπικοποίηση"
-#~ msgid "Package version:"
-#~ msgstr "Έκδοση πακέτου"
+#~ msgid "moreinfo"
+#~ msgstr "περισσότερα"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "προτεινόμενες ενημερώσεις δοκιμαστικού"
+#~ msgid "patch"
+#~ msgstr "εππίραμα"
-#~ msgid "proposed-updates"
-#~ msgstr "προτεινόμενες ενημερώσεις"
+#~ msgid "security"
+#~ msgstr "ασφάλεια"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "χωρίς εμφάνιση στατιστικών στο υποσέλιδο"
+#~ msgid "unreproducible"
+#~ msgstr "μη επαναλαμβανόμενο"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "χωρίς εμφάνιση περιεχομένων στην κεφαλίδα"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "χωρίς ταξινόμηση ανα κατάσταση ή σοβαρότητα"
+#~ msgid "wontfix"
+#~ msgstr "χωρίς λύση"
-#~ msgid "display merged bugs only once"
-#~ msgstr "εμφάνισε τα συγχωνευμένα σφάλματα μια φορά"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "ενεργά προβλήματα"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Σημάνσεις:"
+#~ msgid "Include tag:"
+#~ msgstr "Συμπεριλαμβάνει ετικέτα:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Χωρίς ετικέτα:"
diff --git a/greek/po/distrib.el.po b/greek/po/distrib.el.po
index 50b70dcdfcf..c989b0fa093 100644
--- a/greek/po/distrib.el.po
+++ b/greek/po/distrib.el.po
@@ -210,38 +210,38 @@ msgstr ""
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "non-US"
-#~ msgstr "εκτός-ΗΠ"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "πακέτα που περιέχουν ονόματα αρχείων ή καταλόγους σαν και αυτό"
-#~ msgid "Search case sensitive"
+#~ msgid "all files in this package"
+#~ msgstr "όλα τα αρχεία αυτού του πακέτου"
+
+#~ msgid "Case sensitive"
#~ msgstr "Με έλεγχο Κεφαλαίων/Πεζών"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Ερευνα και σε τμήματα λέξεων"
+#~ msgid "no"
+#~ msgstr "όχι"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "yes"
+#~ msgstr "ναί"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
#~ msgid "AMD64"
#~ msgstr "AMD64"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "yes"
-#~ msgstr "ναί"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "no"
-#~ msgstr "όχι"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Ερευνα και σε τμήματα λέξεων"
-#~ msgid "Case sensitive"
+#~ msgid "Search case sensitive"
#~ msgstr "Με έλεγχο Κεφαλαίων/Πεζών"
-#~ msgid "all files in this package"
-#~ msgstr "όλα τα αρχεία αυτού του πακέτου"
-
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "πακέτα που περιέχουν ονόματα αρχείων ή καταλόγους σαν και αυτό"
+#~ msgid "non-US"
+#~ msgstr "εκτός-ΗΠ"
diff --git a/greek/po/doc.el.po b/greek/po/doc.el.po
index 2d42ed8893a..cd6fdea70db 100644
--- a/greek/po/doc.el.po
+++ b/greek/po/doc.el.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -87,7 +63,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -107,6 +83,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Συγγραφέας:"
@@ -159,10 +151,10 @@ msgstr "(εκδοση <get-var version />)"
msgid "plain text"
msgstr "καθαρό κείμενο"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -187,12 +179,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -225,12 +211,6 @@ msgstr ""
msgid "PDF"
msgstr ""
-#~ msgid "Language:"
-#~ msgstr "Γλώσσα:"
-
-#~ msgid "Latest version in development:"
-#~ msgstr "Υπο ανάπτυξη έκδοση:"
-
#, fuzzy
#~| msgid ""
#~| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-"
@@ -241,3 +221,9 @@ msgstr ""
#~ msgstr ""
#~ "Χρησιμοποιήστε <a href=\"cvs\">CVS</a> για κατέβασμα του κώδικα SGML του "
#~ "<get-var ddp_pkg_loc />."
+
+#~ msgid "Latest version in development:"
+#~ msgstr "Υπο ανάπτυξη έκδοση:"
+
+#~ msgid "Language:"
+#~ msgstr "Γλώσσα:"
diff --git a/greek/po/l10n.el.po b/greek/po/l10n.el.po
index 3659ec43ff7..9d1d4e2e7c8 100644
--- a/greek/po/l10n.el.po
+++ b/greek/po/l10n.el.po
@@ -93,8 +93,8 @@ msgstr "Αρχεία POT"
msgid "Hints for translators"
msgstr "Υποδείξεις για μεταφραστές"
-#~ msgid "Original templates"
-#~ msgstr "Αυθεντικά πρότυπα"
-
#~ msgid "Translated templates"
#~ msgstr "Μεταφρασμένα πρότυπα"
+
+#~ msgid "Original templates"
+#~ msgstr "Αυθεντικά πρότυπα"
diff --git a/greek/po/mailinglists.el.po b/greek/po/mailinglists.el.po
index e1aa3097143..47259bbf71e 100644
--- a/greek/po/mailinglists.el.po
+++ b/greek/po/mailinglists.el.po
@@ -118,8 +118,8 @@ msgstr "ανοικτό"
msgid "closed"
msgstr "κλειστό"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Επιλέξτε σε ποιους καταλόγους θέλετε συνδρομή:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
diff --git a/greek/po/organization.el.po b/greek/po/organization.el.po
index 332b83d9f12..f3869832392 100644
--- a/greek/po/organization.el.po
+++ b/greek/po/organization.el.po
@@ -73,24 +73,24 @@ msgid "Officers"
msgstr "Aξιωματούχοι"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Διανομή"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Δημοσιότητα"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Υποστήριξη και Εσωτερική Δομή"
@@ -107,228 +107,226 @@ msgstr "Επικεφαλής"
msgid "Technical Committee"
msgstr "Τεχνική Επιτροπή"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Γραμματέας"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Έργα Ανάπτυξης"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Αρχειοθήκες FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
#, fuzzy
msgid "FTP Assistants"
msgstr "Βοηθοί Έκδοσης"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Μεμονωμένα Πακέτα"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Διεύθυνση Έκδοσης"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Σημειώσεις Έκδοσης"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Εξασφάλιση Ποιότητας"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Ομάδα Συστήματος Εγκατάστασης"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Σημειώσεις Έκδοσης"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Είδωλα CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Παραγωγή"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Υπό έλεγχο"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Υποστήριξη και Εσωτερική Δομή"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Διαχείριση Συστήματος"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Τεκμηρίωση"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
#, fuzzy
msgid "Work-Needing and Prospective Packages list"
msgstr "Κατάλογος Αναμενόμενων και Πακέτων που χρειάζονται Εργασία"
-#: ../../english/intro/organization.data:178
-#, fuzzy
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "Ομάδα Συστήματος Εγκατάστασης"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Αρχιτεκτονικές"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Ιδιαίτερες Διατάξεις"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Φορητοί"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Τοίχος Προστασίας"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Ενσωματωμένα συστήματα"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Υπεύθυνος Τύπου"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Ιστοσελίδες"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Έργα Ανάπτυξης"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Γεγονότα"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Τεχνική Επιτροπή"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Πρόγραμμα Συνεργατών"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Συντονισμός Δωρεών Υλικού"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Υποστήριξη χρηστών"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Σύστημα Ανίχνευσης Σφάλματος"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Διαχείριση Συνδρομητικών Καταλόγων"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Υποδοχή Νέων Συντηρητών"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
#, fuzzy
msgid "Debian Account Managers"
msgstr "Διαχειριστές Λογαριασμών Προγραμματιστών"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Διαχειριστές Διαβάθμισης (PGP και GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Ομάδα Ασφάλειας"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Σελίδα Συμβούλων"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Σελίδα Πωλητών CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Πολιτική"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Διαχείριση Συστήματος"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -337,7 +335,7 @@ msgstr ""
"προβλήματα με τα μηχανήματα του Debian (συμπεριλαμβανομένων και των κωδικών "
"πρόσβασης ή ανάγκη για εγκατάσταση πακέτων)."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -347,83 +345,116 @@ msgstr ""
"<a href=https://db.debian.org/machines.cgi>Debian Machines</a>, περιλαμβάνει "
"πληροφορίες (ανά μηχάνημα) για τους διαχειριστές."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Διαχειριστής Ανάπτυξης Υπηρεσιών LDAP"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Καθεπτρισμοί"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Συντηρητής DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Σύστημα Ιχνηλάτησης Πακέτων"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Διαχειριστές Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Διαχειριστές Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian για παιδιά από 1 έως 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian για ιατρική πρακτική και έρευνα"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian για την εκπαίδευση"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian σε νομικά γραφεία"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian για άτομα με ειδικές ανάγκες"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian για ιατρική πρακτική και έρευνα"
-#~ msgid "Publicity"
-#~ msgstr "Δημοσιότητα"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian για την εκπαίδευση"
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Debian Διανομή Πολυμέσων"
+
+#~ msgid "Release Assistants"
+#~ msgstr "Βοηθοί Έκδοσης"
+
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Επικεφαλής έκδοσής για τη ``stable''"
+
+#~ msgid "Vendors"
+#~ msgstr "Πωλητές"
+
+#~ msgid "APT Team"
+#~ msgstr "Ομάδα APT"
+
+#~ msgid "Handhelds"
+#~ msgstr "Υπολ. παλάμης"
+
+#~ msgid "Mailing List Archives"
+#~ msgstr "Αρχειοθήκες Συνδρομητικών Καταλόγων"
+
+#, fuzzy
+#~ msgid "Security Testing Team"
#~ msgstr "Ομάδα Ασφάλειας"
-#~ msgid "Security Audit Project"
-#~ msgstr "Εργο επιθεώρησης ασφάλειας"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Συντονισμός Υπογραφών Κλειδιών"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Σύστημα Εγκατάστασης για τη ``stable''"
+#~ msgid "Accountant"
+#~ msgstr "Λογιστήριο"
-#~ msgid "Mailing list"
-#~ msgstr "Συνδρομητικός κατάλογος"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Το Διεθνές Λειτουργικό Σύστημα στην επιφάνεια εργασίας σας"
-#~ msgid "Installation"
-#~ msgstr "Εγκατάσταση"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian για μή-κερδοσκοπικούς οργανισμούς"
-#~ msgid "Delegates"
-#~ msgstr "Απεσταλμένοι"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux για Μεγάλες Επιχειρήσεις"
+
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian Διανομή Πολυμέσων"
#~ msgid ""
#~ "This is not yet an official Debian internal project but it has announced "
@@ -432,46 +463,30 @@ msgstr "Debian για ιατρική πρακτική και έρευνα"
#~ "Αυτό δεν είναι ακόμα ένα επίσημο εσωτερικό έργο αλλά, έχει ανακοινωθεί η "
#~ "πρόθεση ενσωμάτωσης του."
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian Διανομή Πολυμέσων"
-
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux για Μεγάλες Επιχειρήσεις"
+#~ msgid "Delegates"
+#~ msgstr "Απεσταλμένοι"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian για μή-κερδοσκοπικούς οργανισμούς"
+#~ msgid "Installation"
+#~ msgstr "Εγκατάσταση"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Το Διεθνές Λειτουργικό Σύστημα στην επιφάνεια εργασίας σας"
+#~ msgid "Mailing list"
+#~ msgstr "Συνδρομητικός κατάλογος"
-#~ msgid "Accountant"
-#~ msgstr "Λογιστήριο"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Σύστημα Εγκατάστασης για τη ``stable''"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Συντονισμός Υπογραφών Κλειδιών"
+#~ msgid "Security Audit Project"
+#~ msgstr "Εργο επιθεώρησης ασφάλειας"
#, fuzzy
-#~ msgid "Security Testing Team"
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
#~ msgstr "Ομάδα Ασφάλειας"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Αρχειοθήκες Συνδρομητικών Καταλόγων"
-
-#~ msgid "Handhelds"
-#~ msgstr "Υπολ. παλάμης"
-
-#~ msgid "APT Team"
-#~ msgstr "Ομάδα APT"
-
-#~ msgid "Vendors"
-#~ msgstr "Πωλητές"
-
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Επικεφαλής έκδοσής για τη ``stable''"
-
-#~ msgid "Release Assistants"
-#~ msgstr "Βοηθοί Έκδοσης"
+#~ msgid "Publicity"
+#~ msgstr "Δημοσιότητα"
#, fuzzy
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Debian Διανομή Πολυμέσων"
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "Ομάδα Συστήματος Εγκατάστασης"
diff --git a/greek/po/others.el.po b/greek/po/others.el.po
index 9d601fb445f..5d7e953a2df 100644
--- a/greek/po/others.el.po
+++ b/greek/po/others.el.po
@@ -329,61 +329,66 @@ msgstr "Έκδοση"
msgid "URL"
msgstr "Διεύθυνση"
-#, fuzzy
-#~ msgid "Who:"
-#~ msgstr "Τηλέφωνο:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Name:"
-#~ msgstr "Όνομα:"
+#~ msgid "Languages:"
+#~ msgstr "Γλώσσες:"
-#~ msgid "Company:"
-#~ msgstr "Εταιρεία:"
+#~ msgid "Location:"
+#~ msgstr "Τοποθεσία:"
-#~ msgid "URL:"
-#~ msgstr "Διεύθυνση:"
+#~ msgid "Topics:"
+#~ msgstr "Θέματα:"
-#~ msgid "or"
-#~ msgstr "ή"
+#~ msgid "Q"
+#~ msgstr "Ε"
-#~ msgid "Email:"
-#~ msgstr "Ηλ.Διεύθυνση:"
+#~ msgid "developers only"
+#~ msgstr "μόνο για προγραμματιστές"
-#~ msgid "Rates:"
-#~ msgstr "Χρεώσεις:"
+#~ msgid "closed"
+#~ msgstr "κλειστό"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Ενδιαφέρεται για μεταφορά"
+#~ msgid "open"
+#~ msgstr "ανοικτό"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Κατάργηση"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
-#~ "Υπάρχουν <total_consultant> σύμβουλοι του Debian σε <total_country> "
-#~ "χώρες "
+#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
+#~ "πληροφορίες διαγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
+#~ "σελίδα <a href=\"subscribe\">εγγραφής</a> για την δημιουργία συνδρομής. "
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Συνδρομή σε κατάλογο"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Κατάργηση Συνδρομής"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
-#~ "πληροφορίες εγγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
-#~ "σελίδα <a href=\"unsubscribe\">διαγραφής</a> για την κατάργηση συνδρομής. "
+#~ "Παρακαλούμε σεβαστείτε την <a href=\"./#ads\">Πολιτική διαφημίσεων "
+#~ "συνδρομητικών καταλόγων του Debian</a>."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Επιλέξτε σε ποιους καταλόγους θέλετε συνδρομή:"
+#~ msgid "Clear"
+#~ msgstr "Καθαρισμός"
-#~ msgid "No description given"
-#~ msgstr "Δεν δόθηκε περιγραφή"
+#~ msgid "Subscribe"
+#~ msgstr "Συνδρομή"
-#~ msgid "Moderated:"
-#~ msgstr "Ελεγχόμενη:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Η Ηλεκτρονική σας Διεύθυνση:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Αποστολή μηνυμάτων μόνο από συνδρομητές."
+#~ msgid "Subscription:"
+#~ msgstr "Συνδρομή:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -391,63 +396,58 @@ msgstr "Διεύθυνση"
#~ "Αυτή η λίστα λαμβάνει μηνύματα που είναι υπογεγραμένα μόνο από Debian "
#~ "Προγραμματιστή."
-#~ msgid "Subscription:"
-#~ msgstr "Συνδρομή:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Αποστολή μηνυμάτων μόνο από συνδρομητές."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Η Ηλεκτρονική σας Διεύθυνση:"
+#~ msgid "Moderated:"
+#~ msgstr "Ελεγχόμενη:"
-#~ msgid "Subscribe"
-#~ msgstr "Συνδρομή"
+#~ msgid "No description given"
+#~ msgstr "Δεν δόθηκε περιγραφή"
-#~ msgid "Clear"
-#~ msgstr "Καθαρισμός"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Επιλέξτε σε ποιους καταλόγους θέλετε συνδρομή:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
-#~ "Παρακαλούμε σεβαστείτε την <a href=\"./#ads\">Πολιτική διαφημίσεων "
-#~ "συνδρομητικών καταλόγων του Debian</a>."
+#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
+#~ "πληροφορίες εγγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
+#~ "σελίδα <a href=\"unsubscribe\">διαγραφής</a> για την κατάργηση συνδρομής. "
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Κατάργηση Συνδρομής"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Συνδρομή σε κατάλογο"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
-#~ "πληροφορίες διαγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
-#~ "σελίδα <a href=\"subscribe\">εγγραφής</a> για την δημιουργία συνδρομής. "
-
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Κατάργηση"
+#~ "Υπάρχουν <total_consultant> σύμβουλοι του Debian σε <total_country> "
+#~ "χώρες "
-#~ msgid "open"
-#~ msgstr "ανοικτό"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Ενδιαφέρεται για μεταφορά"
-#~ msgid "closed"
-#~ msgstr "κλειστό"
+#~ msgid "Rates:"
+#~ msgstr "Χρεώσεις:"
-#~ msgid "developers only"
-#~ msgstr "μόνο για προγραμματιστές"
+#~ msgid "Email:"
+#~ msgstr "Ηλ.Διεύθυνση:"
-#~ msgid "Q"
-#~ msgstr "Ε"
+#~ msgid "or"
+#~ msgstr "ή"
-#~ msgid "Topics:"
-#~ msgstr "Θέματα:"
+#~ msgid "URL:"
+#~ msgstr "Διεύθυνση:"
-#~ msgid "Location:"
-#~ msgstr "Τοποθεσία:"
+#~ msgid "Company:"
+#~ msgstr "Εταιρεία:"
-#~ msgid "Languages:"
-#~ msgstr "Γλώσσες:"
+#~ msgid "Name:"
+#~ msgstr "Όνομα:"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#, fuzzy
+#~ msgid "Who:"
+#~ msgstr "Τηλέφωνο:"
diff --git a/greek/po/partners.el.po b/greek/po/partners.el.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/greek/po/partners.el.po
+++ b/greek/po/partners.el.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/greek/po/ports.el.po b/greek/po/ports.el.po
index c166a3f2b86..8ae99f4fcb5 100644
--- a/greek/po/ports.el.po
+++ b/greek/po/ports.el.po
@@ -113,65 +113,65 @@ msgstr "Debian για PowerPC"
msgid "Debian for Sparc"
msgstr "Debian για Sparc"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "βασισμένο σε libc5 Debian GNU/FreeBSD"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian για Φορητούς"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian για Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian για AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian για S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian για ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian για MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian για Beowulf"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Χωρίς FPU (R3010)"
+#~ msgid "Main"
+#~ msgstr "Κύρια"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Χωρίς FPU (R2010), εξωτερικές caches"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Specials"
-#~ msgstr "Εξειδικευμένα"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian για Motorola 680x0"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Vendor/Name"
+#~ msgstr "Πωλητής/Ονομα"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Date announced"
+#~ msgstr "Ημερομηνία ανακοίνωσης"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Clock"
+#~ msgstr "Ρολόι"
#~ msgid "ICache"
#~ msgstr "ICache"
-#~ msgid "Clock"
-#~ msgstr "Ρολόι"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Date announced"
-#~ msgstr "Ημερομηνία ανακοίνωσης"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Vendor/Name"
-#~ msgstr "Πωλητής/Ονομα"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian για Motorola 680x0"
+#~ msgid "Specials"
+#~ msgstr "Εξειδικευμένα"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Χωρίς FPU (R2010), εξωτερικές caches"
-#~ msgid "Main"
-#~ msgstr "Κύρια"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Χωρίς FPU (R3010)"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian για Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian για MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian για ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian για S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian για AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian για Sparc64"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian για Φορητούς"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "βασισμένο σε libc5 Debian GNU/FreeBSD"
diff --git a/greek/po/stats.el.po b/greek/po/stats.el.po
index e6fff3c4cf4..441be7cfda9 100644
--- a/greek/po/stats.el.po
+++ b/greek/po/stats.el.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/greek/po/templates.el.po b/greek/po/templates.el.po
index 995690d6442..0e4b422ffd8 100644
--- a/greek/po/templates.el.po
+++ b/greek/po/templates.el.po
@@ -212,11 +212,11 @@ msgstr "στην έκδοση 2.2"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Για να αναφέρετε ένα προβλημα σχετικά με αυτό το δικτυακό τόπο στείλτε "
"μήνυμα (στα Αγγλικά) στο <a href=\"mailto:debian-www@lists.debian.org"
@@ -534,6 +534,10 @@ msgstr ""
"<em>Σημείωση:</em> To >αυθεντικό κείμενο αυτής της μετάφρασης δεν είναι "
"πλέον διαθέσιμο."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -543,165 +547,249 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών του Debian</a>."
-#~ msgid "Select a server near you"
-#~ msgstr "Επιλέξτε έναν κοντινό σας εξυπηρετητή"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Επισκεφθείτε το χορηγό των σελίδων"
-#~ msgid "More information:"
-#~ msgstr "Περισσότερες πληροφορίες:"
+#~ msgid "More information"
+#~ msgstr "Περισσότερες πληροφορίες"
-#~ msgid "Taken by:"
-#~ msgstr "Το ανέλαβε ο:"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Επερχόμενα γεγονότα"
-#~ msgid "Nobody"
-#~ msgstr "Κανένας"
+#~ msgid "link may no longer be valid"
+#~ msgstr "Ο σύνδεσμος μπορεί να μήν είναι έγκυρος"
-#~ msgid "Rating:"
-#~ msgstr "Κατάταξη"
+#~ msgid "When"
+#~ msgstr "Πότε"
-#~ msgid "List of Consultants"
-#~ msgstr "Κατάλογος συμβούλων"
+#~ msgid "Where"
+#~ msgstr "Που"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">συμβούλων του Debian</a>."
+#~ msgid "More Info"
+#~ msgstr "Περισσότερες πληροφορίες"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Debian Involvement"
+#~ msgstr "Συμμετοχή Debian"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Μεταφόρτωση με Jigdo"
+#~ msgid "Main Coordinator"
+#~ msgstr "Κύριος συντονιστής"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "λήψη μέσω HTTP/FTP"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Συντονιστής της</th><th>εργασίας</th>"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Αγορά CD ή DVD"
+#~ msgid "Related Links"
+#~ msgstr "Σχετικοί σύνδεσμοι"
-#~ msgid "Network Install"
-#~ msgstr "Δικτυακή Eγκατάσταση"
+#~ msgid "Latest News"
+#~ msgstr "Τελευταία Νέα"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Μεταφόρτωση"
+#~ msgid "Download calendar entry"
+#~ msgstr "Λήψη ημερολογιακής εγγραφής"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Διάφορα"
+#, fuzzy
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "Πίσω στην <a href=\"m4_HOME/\">Κεντρική σελίδα του Debian</a>."
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Καλιτεχνικά"
+#, fuzzy
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
+#~ "debian-news."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Καθρεπτισμοί"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "υπάρχουν διαθέσιμα <a href=\"../../\">Παλαιότερα τεύχη</a>."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Καθρεπτισμοί Rsync"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Μεταφόρτωση με Torrent"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Ομάδα CD του Debian"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_σε_cd"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />συχνές ερωτήσεις"
+#, fuzzy
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τον %s."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#, fuzzy
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τους %s."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#, fuzzy
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr ""
+#~ "<void id=\"singularfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο την "
+#~ "%s."
-#~ msgid "buy"
-#~ msgstr "αγορά"
+#, fuzzy
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr ""
+#~ "<void id=\"pluralfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τις "
+#~ "%s."
-#~ msgid "net_install"
-#~ msgstr "δικτυακή_εγκατάσταση"
+#~ msgid "List of Speakers"
+#~ msgstr "Κατάλογος Ομιλητών"
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "d id=\"misc-bottom\" />διάφορα"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών του Debian</a>."
+
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
+#~ "debian-news."
+
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
+
+#~ msgid ""
+#~ "<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>."
#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Δωρεές"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Ομάδα CD του Debian"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "πρόταση"
+#~ msgid "No requests for adoption"
+#~ msgstr "Περισσότερες πληροφορίες"
#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Συζήτηση"
+#~ msgid "No Requested packages"
+#~ msgstr "Πακέτα που επηρεάζονται"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Σε αναμονή χορηγών"
+#~ msgid "License Information"
+#~ msgstr "Πληροφορίες Αδειας Χρήσης"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Σε εξέλιξη"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Έχει αρχίσει ψηφοφορία"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Version %s: %s"
-#~ msgid "Decided"
-#~ msgstr "Έχει αποφασιστεί"
+#~ msgid "Date published"
+#~ msgstr "Ημερομηνία Εκδοσης"
-#~ msgid "Withdrawn"
-#~ msgstr "αποσύρθηκε"
+#~ msgid "License"
+#~ msgstr "Αδεια Χρήσης"
-#~ msgid "Other"
-#~ msgstr "Άλλα"
+#~ msgid "Version"
+#~ msgstr "Εκδοση"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Κεντρική σελίδα ψηφοφορίας"
+#~ msgid "Summary"
+#~ msgstr "Σύνοψη"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Πώς να ψηφίσετε"
+#~ msgid "Discussion"
+#~ msgstr "Συζήτηση"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Κάντε τις προτάσεις σας"
+#~ msgid "free"
+#~ msgstr "ελευθερο"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Πρόταση τροπολογίας"
+#~ msgid "non-free"
+#~ msgstr "μη-ελευθερο"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ακολουθία πρότασης"
+#~ msgid "Free"
+#~ msgstr "Ελεύθερο"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Ανάγνωση αποτελεσμάτων"
+#~ msgid "Non-Free"
+#~ msgstr "Μη-Ελεύθερο"
-#~ msgid "Vote"
-#~ msgstr "Ψηφοφορία"
+#~ msgid "discussed"
+#~ msgstr "έχουν συζητηθεί"
-#~ msgid "Please use English when sending mail."
-#~ msgstr "Παρακαλούμε χρησιμοποιήστε Αγγλικά για αποστολή μηνύματος."
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">Νέων του Debian</a>."
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (νεκρός σύνδεσμος)"
+#~ msgid "network install"
+#~ msgstr "δικτυακή εγκατάσταση"
-#~ msgid "download with pik"
-#~ msgstr "λήψη με το pik"
+#~ msgid "buy pre-made images"
+#~ msgstr "αγορά έτοιμων ειδώλων"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Συμβουλή ασφάλειας"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Δείτε την σελίδα <a href=\"m4_HOME/contact\"> επικοινωνίας με το Debian</"
+#~ "a> για πληροφορίες επικοινωνίας μαζί μας."
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Συμβουλές ασφάλειας"
+#~ msgid "Security database references"
+#~ msgstr "Αναφορές βάσης δεδομένων ασφαλείας"
-#~ msgid "Vulnerable"
-#~ msgstr "τρωτά"
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "Στο λεξικό Mitre's CVE:"
-#~ msgid "Fixed in"
-#~ msgstr "Επιδιορθώθηκε την"
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "Στη βάση δεδομένων (στο SecurityFocus):"
-#~ msgid "Source:"
-#~ msgstr "Κώδικας:"
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "Σημειώσεις του CERT για περιστατικά και τρωτά σημεία:"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Στοιχείο ανεξάρτητο αρχιτεκτονικής:"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Δεν υπάρχουν διαθέσιμες άλλες εξωτερικές αναφορές στην βάση αυτή τη "
+#~ "στιγμή."
#, fuzzy
#~ msgid ""
@@ -711,246 +799,162 @@ msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών τ
#~ "Το άθροισμα ελέγχου MD5 των εικονιζομένων αρχείων είναι διαθέσιμο στη <a "
#~ "href=\"%attributes\">αρχική συμβουλή</a>."
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "Δεν υπάρχουν διαθέσιμες άλλες εξωτερικές αναφορές στην βάση αυτή τη "
-#~ "στιγμή."
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Στοιχείο ανεξάρτητο αρχιτεκτονικής:"
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "Σημειώσεις του CERT για περιστατικά και τρωτά σημεία:"
+#~ msgid "Source:"
+#~ msgstr "Κώδικας:"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "Στη βάση δεδομένων (στο SecurityFocus):"
+#~ msgid "Fixed in"
+#~ msgstr "Επιδιορθώθηκε την"
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "Στο λεξικό Mitre's CVE:"
+#~ msgid "Vulnerable"
+#~ msgstr "τρωτά"
-#~ msgid "Security database references"
-#~ msgstr "Αναφορές βάσης δεδομένων ασφαλείας"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Συμβουλές ασφάλειας"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Δείτε την σελίδα <a href=\"m4_HOME/contact\"> επικοινωνίας με το Debian</"
-#~ "a> για πληροφορίες επικοινωνίας μαζί μας."
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Συμβουλή ασφάλειας"
-#~ msgid "buy pre-made images"
-#~ msgstr "αγορά έτοιμων ειδώλων"
+#~ msgid "download with pik"
+#~ msgstr "λήψη με το pik"
-#~ msgid "network install"
-#~ msgstr "δικτυακή εγκατάσταση"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (νεκρός σύνδεσμος)"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">Νέων του Debian</a>."
+#~ msgid "Please use English when sending mail."
+#~ msgstr "Παρακαλούμε χρησιμοποιήστε Αγγλικά για αποστολή μηνύματος."
-#~ msgid "discussed"
-#~ msgstr "έχουν συζητηθεί"
+#~ msgid "Vote"
+#~ msgstr "Ψηφοφορία"
-#~ msgid "Non-Free"
-#~ msgstr "Μη-Ελεύθερο"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Ανάγνωση αποτελεσμάτων"
-#~ msgid "Free"
-#~ msgstr "Ελεύθερο"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ακολουθία πρότασης"
-#~ msgid "non-free"
-#~ msgstr "μη-ελευθερο"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Πρόταση τροπολογίας"
-#~ msgid "free"
-#~ msgstr "ελευθερο"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Κάντε τις προτάσεις σας"
-#~ msgid "Discussion"
-#~ msgstr "Συζήτηση"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Πώς να ψηφίσετε"
-#~ msgid "Summary"
-#~ msgstr "Σύνοψη"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Κεντρική σελίδα ψηφοφορίας"
-#~ msgid "Version"
-#~ msgstr "Εκδοση"
+#~ msgid "Other"
+#~ msgstr "Άλλα"
-#~ msgid "License"
-#~ msgstr "Αδεια Χρήσης"
+#~ msgid "Withdrawn"
+#~ msgstr "αποσύρθηκε"
-#~ msgid "Date published"
-#~ msgstr "Ημερομηνία Εκδοσης"
+#~ msgid "Decided"
+#~ msgstr "Έχει αποφασιστεί"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Version %s: %s"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Έχει αρχίσει ψηφοφορία"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Σε εξέλιξη"
-#~ msgid "License Information"
-#~ msgstr "Πληροφορίες Αδειας Χρήσης"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Σε αναμονή χορηγών"
#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Πακέτα που επηρεάζονται"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Συζήτηση"
#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Περισσότερες πληροφορίες"
+#~ msgid "Proposer"
+#~ msgstr "πρόταση"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debate"
+#~ msgstr "Ομάδα CD του Debian"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
-#~ "debian-news."
+#~ msgid "Nominations"
+#~ msgstr "Δωρεές"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών του Debian</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "d id=\"misc-bottom\" />διάφορα"
-#~ msgid "List of Speakers"
-#~ msgstr "Κατάλογος Ομιλητών"
+#~ msgid "net_install"
+#~ msgstr "δικτυακή_εγκατάσταση"
-#, fuzzy
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr ""
-#~ "<void id=\"pluralfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τις "
-#~ "%s."
+#~ msgid "buy"
+#~ msgstr "αγορά"
-#, fuzzy
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr ""
-#~ "<void id=\"singularfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο την "
-#~ "%s."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#, fuzzy
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τους %s."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τον %s."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />συχνές ερωτήσεις"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_σε_cd"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Ομάδα CD του Debian"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Μεταφόρτωση με Torrent"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Καθρεπτισμοί Rsync"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "υπάρχουν διαθέσιμα <a href=\"../../\">Παλαιότερα τεύχη</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Καθρεπτισμοί"
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
-#~ "debian-news."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Καλιτεχνικά"
-#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "Πίσω στην <a href=\"m4_HOME/\">Κεντρική σελίδα του Debian</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Διάφορα"
-#~ msgid "Download calendar entry"
-#~ msgstr "Λήψη ημερολογιακής εγγραφής"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Μεταφόρτωση"
-#~ msgid "Latest News"
-#~ msgstr "Τελευταία Νέα"
+#~ msgid "Network Install"
+#~ msgstr "Δικτυακή Eγκατάσταση"
-#~ msgid "Related Links"
-#~ msgstr "Σχετικοί σύνδεσμοι"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Αγορά CD ή DVD"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Συντονιστής της</th><th>εργασίας</th>"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "λήψη μέσω HTTP/FTP"
-#~ msgid "Main Coordinator"
-#~ msgstr "Κύριος συντονιστής"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Μεταφόρτωση με Jigdo"
-#~ msgid "Debian Involvement"
-#~ msgstr "Συμμετοχή Debian"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "More Info"
-#~ msgstr "Περισσότερες πληροφορίες"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">συμβούλων του Debian</a>."
-#~ msgid "Where"
-#~ msgstr "Που"
+#~ msgid "List of Consultants"
+#~ msgstr "Κατάλογος συμβούλων"
-#~ msgid "When"
-#~ msgstr "Πότε"
+#~ msgid "Rating:"
+#~ msgstr "Κατάταξη"
-#~ msgid "link may no longer be valid"
-#~ msgstr "Ο σύνδεσμος μπορεί να μήν είναι έγκυρος"
+#~ msgid "Nobody"
+#~ msgstr "Κανένας"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Επερχόμενα γεγονότα"
+#~ msgid "Taken by:"
+#~ msgstr "Το ανέλαβε ο:"
-#~ msgid "More information"
-#~ msgstr "Περισσότερες πληροφορίες"
+#~ msgid "More information:"
+#~ msgstr "Περισσότερες πληροφορίες:"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Επισκεφθείτε το χορηγό των σελίδων"
+#~ msgid "Select a server near you"
+#~ msgstr "Επιλέξτε έναν κοντινό σας εξυπηρετητή"
diff --git a/greek/po/vendors.el.po b/greek/po/vendors.el.po
index 343bf577ce2..f70dfc95edf 100644
--- a/greek/po/vendors.el.po
+++ b/greek/po/vendors.el.po
@@ -75,74 +75,74 @@ msgstr "πηγαίος κώδικας"
msgid "and"
msgstr "και"
-#~ msgid "Vendor:"
-#~ msgstr "Πωλητής:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Ιστοσελίδα για το Debian:"
+#~ msgid "Official CD"
+#~ msgstr "Επίσημο CD"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Επιτρέπει συνεισφορά στο Debian:"
+#~ msgid "Official DVD"
+#~ msgstr "Επίσημο DVD"
-#~ msgid "Country:"
-#~ msgstr "Χώρα:"
+#~ msgid "Development Snapshot"
+#~ msgstr "Στιγμιότυπο Ανάπτυξης"
-#~ msgid "Ship International:"
-#~ msgstr "Διεθνείς αποστολές:"
+#~ msgid "Vendor Release"
+#~ msgstr "Έκδοση Πωλητή"
-#~ msgid "email:"
-#~ msgstr "email:"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Πολλαπλές Διανομές"
-#~ msgid "CD Type:"
-#~ msgstr "Είδος CD:"
+#~ msgid "non-US included"
+#~ msgstr "Περιλαμβάνει το non-US"
-#~ msgid "DVD Type:"
-#~ msgstr "Είδος DVD:"
+#~ msgid "non-free included"
+#~ msgstr "Περιλαμβάνει το non-free"
-#~ msgid "Architectures:"
-#~ msgstr "Αρχιτεκτονικές:"
+#~ msgid "contrib included"
+#~ msgstr "Περιλαμβάνει το contrib"
-#~ msgid "updated monthly"
-#~ msgstr "Ανανεώνεται μηνιαία"
+#~ msgid "vendor additions"
+#~ msgstr "Με προσθήκες απο τον πωλητή"
-#~ msgid "updated twice weekly"
-#~ msgstr "Ανανεώνεται δυο φορές την εβδομάδα"
+#~ msgid "Custom Release"
+#~ msgstr "Προσαρμοσμένη Έκδοση"
-#~ msgid "updated weekly"
-#~ msgstr "Ανανεώνεται καθε εβδομάδα"
+#~ msgid "reseller of $var"
+#~ msgstr "μεταπωλητής του $var"
#~ msgid "reseller"
#~ msgstr "μεταπωλητής"
-#~ msgid "reseller of $var"
-#~ msgstr "μεταπωλητής του $var"
+#~ msgid "updated weekly"
+#~ msgstr "Ανανεώνεται καθε εβδομάδα"
-#~ msgid "Custom Release"
-#~ msgstr "Προσαρμοσμένη Έκδοση"
+#~ msgid "updated twice weekly"
+#~ msgstr "Ανανεώνεται δυο φορές την εβδομάδα"
-#~ msgid "vendor additions"
-#~ msgstr "Με προσθήκες απο τον πωλητή"
+#~ msgid "updated monthly"
+#~ msgstr "Ανανεώνεται μηνιαία"
-#~ msgid "contrib included"
-#~ msgstr "Περιλαμβάνει το contrib"
+#~ msgid "Architectures:"
+#~ msgstr "Αρχιτεκτονικές:"
-#~ msgid "non-free included"
-#~ msgstr "Περιλαμβάνει το non-free"
+#~ msgid "DVD Type:"
+#~ msgstr "Είδος DVD:"
-#~ msgid "non-US included"
-#~ msgstr "Περιλαμβάνει το non-US"
+#~ msgid "CD Type:"
+#~ msgstr "Είδος CD:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Πολλαπλές Διανομές"
+#~ msgid "email:"
+#~ msgstr "email:"
-#~ msgid "Vendor Release"
-#~ msgstr "Έκδοση Πωλητή"
+#~ msgid "Ship International:"
+#~ msgstr "Διεθνείς αποστολές:"
-#~ msgid "Development Snapshot"
-#~ msgstr "Στιγμιότυπο Ανάπτυξης"
+#~ msgid "Country:"
+#~ msgstr "Χώρα:"
-#~ msgid "Official DVD"
-#~ msgstr "Επίσημο DVD"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Επιτρέπει συνεισφορά στο Debian:"
-#~ msgid "Official CD"
-#~ msgstr "Επίσημο CD"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Ιστοσελίδα για το Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Πωλητής:"
diff --git a/hebrew/po/blends.he.po b/hebrew/po/blends.he.po
index 64b8c15bf29..b00934651af 100644
--- a/hebrew/po/blends.he.po
+++ b/hebrew/po/blends.he.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/hebrew/po/doc.he.po b/hebrew/po/doc.he.po
index 23c84d393d3..1fcdfe5e2fc 100644
--- a/hebrew/po/doc.he.po
+++ b/hebrew/po/doc.he.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -87,7 +63,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -107,6 +83,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
@@ -159,10 +151,10 @@ msgstr ""
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -187,12 +179,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
diff --git a/hebrew/po/organization.he.po b/hebrew/po/organization.he.po
index 0015e749059..f0c5a564ed8 100644
--- a/hebrew/po/organization.he.po
+++ b/hebrew/po/organization.he.po
@@ -73,24 +73,24 @@ msgid "Officers"
msgstr "קצינים"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "הפצה"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "יחסי ציבור"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "תמיכה ותשתית"
@@ -107,304 +107,317 @@ msgstr "מנהיג"
msgid "Technical Committee"
msgstr "וועדה טכנית"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "מזכיר"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "מיזמי פיתוח"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "ארכיוני FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "מנהל ה-FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "סייעי FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "חבילות עצמאיות"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "הנהלת השחרור"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "צוות השחרור"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "אבטחת איכות"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "צוות התקנת המערכת"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "הודעות שחרור"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "הפקה"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "בחינה"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "תמיכה ותשתית"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "ניהול מערכת"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "תיעוד"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "עבודה נדרשת והצעות לאריזת תוכנה"
-#: ../../english/intro/organization.data:178
-#, fuzzy
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "צוות התקנת המערכת"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "הגדרות מיוחדות"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "מחשבים ניידים"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "חומות אש"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "איש קשר לעיתונות"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "דפי רשת"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "פלאנט דביאן"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "אירועים"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "וועדה טכנית"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "שותפים לתוכנית"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "תמיכת משתמשים"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "מערכת מעקב באגים"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "ניהול רשימות תפוצה וארכיון רשימות תפוצה"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "מנהלי חשבונות דביאן"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "צוות אבטחה"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "מדיניות"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "ניהול מערכת"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
"contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "System Administration"
+msgid "Salsa administrators"
+msgstr "ניהול מערכת"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
-#~ msgid "Publicity"
-#~ msgstr "יחסי ציבור"
+#: ../../english/intro/organization.data:492
+msgid "Debian for astronomy"
+msgstr ""
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "הפצות דביאן מותאמות אישית"
+#~ msgid "Testing Security Team"
+#~ msgstr "צוות אבטחה להפצת הבחינה"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "צוות השחרור להפצה ה'יציבה'"
+#~ msgid "Marketing Team"
+#~ msgstr "צוות שיווק"
-#~ msgid "Vendors"
-#~ msgstr "ספקים"
+#~ msgid "Handhelds"
+#~ msgstr "מחשבי כף יד"
#~ msgid "APT Team"
#~ msgstr "צוות APT"
-#~ msgid "Handhelds"
-#~ msgstr "מחשבי כף יד"
+#~ msgid "Vendors"
+#~ msgstr "ספקים"
-#~ msgid "Marketing Team"
-#~ msgstr "צוות שיווק"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "צוות השחרור להפצה ה'יציבה'"
-#~ msgid "Testing Security Team"
-#~ msgstr "צוות אבטחה להפצת הבחינה"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "הפצות דביאן מותאמות אישית"
+
+#~ msgid "Publicity"
+#~ msgstr "יחסי ציבור"
+
+#, fuzzy
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "צוות התקנת המערכת"
diff --git a/hebrew/po/others.he.po b/hebrew/po/others.he.po
index 118e5d4de1b..ddd34652317 100644
--- a/hebrew/po/others.he.po
+++ b/hebrew/po/others.he.po
@@ -329,68 +329,68 @@ msgstr "גרסה"
msgid "URL"
msgstr ""
-#~ msgid "Mailing List Subscription"
-#~ msgstr "הרשמה לרשימת התפוצה"
+#~ msgid "Wanted:"
+#~ msgstr "דרושים:"
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
-#~ msgstr ""
-#~ "בקרו בעמוד <a href=\"./#subunsub\">רשימות תפוצה</a>על מנת לקבל מידע נוסף "
-#~ "כיצד יש להסיר את שמכם מרשימות התפוצה באמצעות שליחת דואר אלקטרוני. ניתן "
-#~ "לעשות זאת גם על ידי מילוי טופס בדף האינטרט <a href=\"unsubscribe\">טופס "
-#~ "הסרה מרשימות תפוצה</a>. "
+#~ msgid "Who:"
+#~ msgstr "מי:"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "שימו לב לכך שמרבית רשימות התפוצה של דביאן הינן גלויות לציבור. כל דואר "
-#~ "שיישלח אליהן יפורסם ברבים, יאוכסן בארכיב ויימצא על ידי מנועי חיפוש. עליכם "
-#~ "להרשם לרשימות התפוצה של דביאן באמצעות כתובת דואר אלקטרוני אשר לא אכפת לכם "
-#~ "שתהיה גלויה לציבור. "
+#~ msgid "Architecture:"
+#~ msgstr "ארכיטקטורה:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "נא בחרו לאיזו רשימת תפוצה ברצונכם להרשם:"
+#~ msgid "Specifications:"
+#~ msgstr "מפרט טכני:"
-#~ msgid "No description given"
-#~ msgstr "לא ניתן תיאור"
+#~ msgid "Where:"
+#~ msgstr "איפה:"
-#~ msgid "Moderated:"
-#~ msgstr "מפוקח"
+#~ msgid "Topics:"
+#~ msgstr "נושאים:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "רק משתמשים רשומים יכולים להשאיר הודעות"
+#~ msgid "Location:"
+#~ msgstr "מיקום"
+
+#~ msgid "Languages:"
+#~ msgstr "שפות:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "שיחות קודמות:"
#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
-#~ msgstr "רק הודעות חתומות על ידי מפתח דביאן יתקבלו לרשימה זו"
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> יועצים לדביאן <total_country> מדינות ברחבי העולם."
-#~ msgid "Subscription:"
-#~ msgstr "הרשמה"
+#~ msgid "Willing to Relocate"
+#~ msgstr "מוכן לעבור מקום מגורים"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "רשימת תפוצה במצב קריאה בלבד"
+#~ msgid "Rates:"
+#~ msgstr "קצבים:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "כתובת הדואר האלקטרוני שלך"
+#~ msgid "Email:"
+#~ msgstr "דואר אלקטרוני:"
-#~ msgid "Subscribe"
-#~ msgstr "הרשמה"
+#~ msgid "or"
+#~ msgstr "או"
-#~ msgid "Clear"
-#~ msgstr "נקה"
+#~ msgid "Company:"
+#~ msgstr "חברה:"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr "נא לכבד את <a href=\"./#ads\"> נהלי הפרסום ברשימות התפוצה של דביאן"
+#~ msgid "Name:"
+#~ msgstr "שם:"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "הסרה מרשימת התפוצה"
+#~ msgid "closed"
+#~ msgstr "סגור"
+
+#~ msgid "open"
+#~ msgstr "פתוח"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "הסרה מרשימת תפוצה"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "נא בחרו מאיזו רשימת תפוצה להסיר את שמכם:"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -402,65 +402,65 @@ msgstr ""
#~ "לעשות זאת גם על ידי מילוי טופס בדף האינטרט <a href=\"unsubscribe\">טופס "
#~ "הסרה מרשימות תפוצה</a>. "
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "נא בחרו מאיזו רשימת תפוצה להסיר את שמכם:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "הסרה מרשימת תפוצה"
-
-#~ msgid "open"
-#~ msgstr "פתוח"
-
-#~ msgid "closed"
-#~ msgstr "סגור"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "הסרה מרשימת התפוצה"
-#~ msgid "Name:"
-#~ msgstr "שם:"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr "נא לכבד את <a href=\"./#ads\"> נהלי הפרסום ברשימות התפוצה של דביאן"
-#~ msgid "Company:"
-#~ msgstr "חברה:"
+#~ msgid "Clear"
+#~ msgstr "נקה"
-#~ msgid "or"
-#~ msgstr "או"
+#~ msgid "Subscribe"
+#~ msgstr "הרשמה"
-#~ msgid "Email:"
-#~ msgstr "דואר אלקטרוני:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "כתובת הדואר האלקטרוני שלך"
-#~ msgid "Rates:"
-#~ msgstr "קצבים:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "רשימת תפוצה במצב קריאה בלבד"
-#~ msgid "Willing to Relocate"
-#~ msgstr "מוכן לעבור מקום מגורים"
+#~ msgid "Subscription:"
+#~ msgstr "הרשמה"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> יועצים לדביאן <total_country> מדינות ברחבי העולם."
-
-#~ msgid "Previous Talks:"
-#~ msgstr "שיחות קודמות:"
-
-#~ msgid "Languages:"
-#~ msgstr "שפות:"
+#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ msgstr "רק הודעות חתומות על ידי מפתח דביאן יתקבלו לרשימה זו"
-#~ msgid "Location:"
-#~ msgstr "מיקום"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "רק משתמשים רשומים יכולים להשאיר הודעות"
-#~ msgid "Topics:"
-#~ msgstr "נושאים:"
+#~ msgid "Moderated:"
+#~ msgstr "מפוקח"
-#~ msgid "Where:"
-#~ msgstr "איפה:"
+#~ msgid "No description given"
+#~ msgstr "לא ניתן תיאור"
-#~ msgid "Specifications:"
-#~ msgstr "מפרט טכני:"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "נא בחרו לאיזו רשימת תפוצה ברצונכם להרשם:"
-#~ msgid "Architecture:"
-#~ msgstr "ארכיטקטורה:"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "שימו לב לכך שמרבית רשימות התפוצה של דביאן הינן גלויות לציבור. כל דואר "
+#~ "שיישלח אליהן יפורסם ברבים, יאוכסן בארכיב ויימצא על ידי מנועי חיפוש. עליכם "
+#~ "להרשם לרשימות התפוצה של דביאן באמצעות כתובת דואר אלקטרוני אשר לא אכפת לכם "
+#~ "שתהיה גלויה לציבור. "
-#~ msgid "Who:"
-#~ msgstr "מי:"
+#~ msgid ""
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ msgstr ""
+#~ "בקרו בעמוד <a href=\"./#subunsub\">רשימות תפוצה</a>על מנת לקבל מידע נוסף "
+#~ "כיצד יש להסיר את שמכם מרשימות התפוצה באמצעות שליחת דואר אלקטרוני. ניתן "
+#~ "לעשות זאת גם על ידי מילוי טופס בדף האינטרט <a href=\"unsubscribe\">טופס "
+#~ "הסרה מרשימות תפוצה</a>. "
-#~ msgid "Wanted:"
-#~ msgstr "דרושים:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "הרשמה לרשימת התפוצה"
diff --git a/hebrew/po/partners.he.po b/hebrew/po/partners.he.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/hebrew/po/partners.he.po
+++ b/hebrew/po/partners.he.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/hebrew/po/ports.he.po b/hebrew/po/ports.he.po
index 3c76c289a5c..08aa2e2c046 100644
--- a/hebrew/po/ports.he.po
+++ b/hebrew/po/ports.he.po
@@ -113,32 +113,32 @@ msgstr "דביאן עבור ארכיטקטורת PowerPC"
msgid "Debian for Sparc"
msgstr "דביאן עבור ארכיטקטורת SPARC"
-#~ msgid "Debian for AMD64"
-#~ msgstr "דביאן עבור ארכיטקטורת AMD64"
-
-#~ msgid "Debian for ARM"
-#~ msgstr "דביאן עבור ארכיטקטורת ARM"
+#~ msgid "Debian for Laptops"
+#~ msgstr "דביאן למחשבים ניידים"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "דביאן עבור ארכיטקטורת Beowulf"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "דביאן עבור ארכיטקטורת SPARC64"
-#~ msgid "Main"
-#~ msgstr "ראשי"
+#~ msgid "Debian for S/390"
+#~ msgstr "דביאן עבור ארכיטקטורת S/390"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "דביאן GNU/FreeBSD"
+#~ msgid "Debian for MIPS"
+#~ msgstr "דביאן עבור ארכיטקטורת MIPS"
#~ msgid "Debian for Motorola 680x0"
#~ msgstr "דביאן עבור ארכיטקטורת Motorola 680x0"
-#~ msgid "Debian for MIPS"
-#~ msgstr "דביאן עבור ארכיטקטורת MIPS"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "דביאן GNU/FreeBSD"
-#~ msgid "Debian for S/390"
-#~ msgstr "דביאן עבור ארכיטקטורת S/390"
+#~ msgid "Main"
+#~ msgstr "ראשי"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "דביאן עבור ארכיטקטורת SPARC64"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "דביאן עבור ארכיטקטורת Beowulf"
-#~ msgid "Debian for Laptops"
-#~ msgstr "דביאן למחשבים ניידים"
+#~ msgid "Debian for ARM"
+#~ msgstr "דביאן עבור ארכיטקטורת ARM"
+
+#~ msgid "Debian for AMD64"
+#~ msgstr "דביאן עבור ארכיטקטורת AMD64"
diff --git a/hebrew/po/stats.he.po b/hebrew/po/stats.he.po
index 1d9e2c20724..72c741539ae 100644
--- a/hebrew/po/stats.he.po
+++ b/hebrew/po/stats.he.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/hebrew/po/templates.he.po b/hebrew/po/templates.he.po
index aa8cfcf3273..520477a124d 100644
--- a/hebrew/po/templates.he.po
+++ b/hebrew/po/templates.he.po
@@ -213,11 +213,11 @@ msgstr "בגרסה 2.2"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"על מנת לדווח על בעיות באתר, שלחו דואר אלקטרוני ל<a href=\"mailto:debian-"
"www@lists.debian.org\">debian-www@lists.debian.org</a>. למידע נוסף על אפשרות "
@@ -516,6 +516,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr ""
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr ""
@@ -524,20 +528,20 @@ msgstr ""
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "חזרה אל עמוד <a href=\"../\">מי משתמש בדביאן?</a>."
-#~ msgid "Rating:"
-#~ msgstr "דירוג:"
-
-#~ msgid "Nobody"
-#~ msgstr "אף אחד"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "בקרו באתר נותן החסות"
-#~ msgid "Taken by:"
-#~ msgstr "נלקח על ידי:"
+#~ msgid "Select a server near you"
+#~ msgstr "בחר שרת קרוב אליך"
#~ msgid "More information:"
#~ msgstr "מידע נוסף:"
-#~ msgid "Select a server near you"
-#~ msgstr "בחר שרת קרוב אליך"
+#~ msgid "Taken by:"
+#~ msgstr "נלקח על ידי:"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "בקרו באתר נותן החסות"
+#~ msgid "Nobody"
+#~ msgstr "אף אחד"
+
+#~ msgid "Rating:"
+#~ msgstr "דירוג:"
diff --git a/hungarian/po/blends.hu.po b/hungarian/po/blends.hu.po
index 64b8c15bf29..b00934651af 100644
--- a/hungarian/po/blends.hu.po
+++ b/hungarian/po/blends.hu.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/hungarian/po/countries.hu.po b/hungarian/po/countries.hu.po
index d1da4c9b264..6c5212e1c4f 100644
--- a/hungarian/po/countries.hu.po
+++ b/hungarian/po/countries.hu.po
@@ -425,8 +425,8 @@ msgstr "Dél-Afrika"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoszlávia"
-
#~ msgid "Great Britain"
#~ msgstr "Nagy-Britannia"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoszlávia"
diff --git a/hungarian/po/distrib.hu.po b/hungarian/po/distrib.hu.po
index f8b37bfbe59..b62eeca227d 100644
--- a/hungarian/po/distrib.hu.po
+++ b/hungarian/po/distrib.hu.po
@@ -208,54 +208,54 @@ msgstr ""
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr ""
+#~ "azokat csomagokat, amelyek ilyen nevű fájlt vagy könyvtárat tartalmaznak"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "az összes fájlt ebben a csomagban"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Kis- és nagybetűk különböznek"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "nem"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "igen"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Részszavakat is keressen"
#~ msgid "Search case sensitive"
#~ msgstr "Kis- és nagybetűk különböznek"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Részszavakat is keressen"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "yes"
-#~ msgstr "igen"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "no"
-#~ msgstr "nem"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Case sensitive"
-#~ msgstr "Kis- és nagybetűk különböznek"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "all files in this package"
-#~ msgstr "az összes fájlt ebben a csomagban"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr ""
-#~ "azokat csomagokat, amelyek ilyen nevű fájlt vagy könyvtárat tartalmaznak"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/hungarian/po/doc.hu.po b/hungarian/po/doc.hu.po
index 99a39cd27f1..a3bf4abc721 100644
--- a/hungarian/po/doc.hu.po
+++ b/hungarian/po/doc.hu.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -87,7 +63,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -107,6 +83,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Szerző:"
@@ -159,10 +151,10 @@ msgstr "(<get-var version />) verzió"
msgid "plain text"
msgstr "sima szöveg"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -187,12 +179,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -223,12 +209,12 @@ msgstr ""
msgid "PDF"
msgstr ""
+#~ msgid "Language:"
+#~ msgstr "Nyelv:"
+
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "Használd <a href=\"cvs\">az SVN-t</a>, hogy letöltsd az SGML forrás "
#~ "szöveget az alábbihoz: <get-var ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Nyelv:"
diff --git a/hungarian/po/mailinglists.hu.po b/hungarian/po/mailinglists.hu.po
index 09586244816..6a69d7304da 100644
--- a/hungarian/po/mailinglists.hu.po
+++ b/hungarian/po/mailinglists.hu.po
@@ -120,8 +120,8 @@ msgstr "nyitott"
msgid "closed"
msgstr "zárt"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Válaszd ki, melyik listára szeretnél feliratkozni:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Váaszd ki, melyik listáról szeretnél leiratkozni:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Válaszd ki, melyik listára szeretnél feliratkozni:"
diff --git a/hungarian/po/organization.hu.po b/hungarian/po/organization.hu.po
index fb7002da0db..b97ba9fdf60 100644
--- a/hungarian/po/organization.hu.po
+++ b/hungarian/po/organization.hu.po
@@ -75,24 +75,24 @@ msgid "Officers"
msgstr "Tisztviselők"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Disztribúció"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Sajtó és nyilvánosság"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Felhasználói támogatás és infrastruktúra"
@@ -109,227 +109,225 @@ msgstr "Vezető"
msgid "Technical Committee"
msgstr "Szakmai bizottság"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Titkár"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Fejlesztési projektek"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP-archívumok"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "főnök"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP asszisztensek"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Egyedi csomagok"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Kiadásmenedzsment"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Verzióinformációk"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Minőségbiztosítás"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "A telepítési rendszer karbantartói"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Verzióinformációk"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD-image-ek"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Gyártás"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Tesztelés"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Felhasználói támogatás és infrastruktúra"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Rendszeradminisztráció"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentáció"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "További munkát igénylő és jövőbeli csomagok"
-#: ../../english/intro/organization.data:178
-#, fuzzy
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "A telepítési rendszer karbantartói"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Portolások"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Különleges konfigurációk"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Laptopok"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Tűzfalak"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Beágyazott rendszerek"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Sajtókapcsolatok"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Weboldalak"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Fejlesztési projektek"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Események"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Szakmai bizottság"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Partnerségi program"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Hardveradomány-koordinátorok"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Felhasználói támogatás"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Hibakövető rendszer"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "A levelezőlisták adminisztrátorai"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Új karbantartók felvétele"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debian accountok kezelése"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Kulcscsomó-karbantartók (PGP és GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Biztonsági csoport"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Konzultánsok oldala"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "CD-terjesztők oldala"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Szabályzat"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Rendszeradminisztráció"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -337,7 +335,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:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -347,139 +345,156 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP fejlesztői adatbázis adminisztrátora"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Tükrözések"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS-karbantartó"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Csomagkövető rendszer"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth-felügyelet"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth-felügyelet"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian gyerekeknek 1-től 99 éves korig"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian az orvosi gyakorlatban és kutatásban"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian az oktatásban"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian az ügyvédi irodákban"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian a fogyatékkal élők számára"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian az orvosi gyakorlatban és kutatásban"
-#~ msgid "Publicity"
-#~ msgstr "Sajtó és nyilvánosság"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian az oktatásban"
#, fuzzy
-#~| msgid "New Maintainers Front Desk"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Új karbantartók felvétele"
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Biztonsági csoport"
-#~ msgid "Vendors"
-#~ msgstr "Terjesztők"
+#~ msgid "Security Audit Project"
+#~ msgstr "Biztonsági ellenőrzési projekt"
-#~ msgid "Internal Projects"
-#~ msgstr "Belső projektek"
+#, fuzzy
+#~| msgid "Security Testing Team"
+#~ msgid "Marketing Team"
+#~ msgstr "Biztonsági tesztelő csoport"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "A \"stable\" telepítőrendszere"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Testre szabott Debian disztribúciók"
-#~ msgid "Mailing list"
-#~ msgstr "Levelezőlista"
+#~ msgid "Release Assistants"
+#~ msgstr "Kiadás asszisztensek"
-#~ msgid "Installation"
-#~ msgstr "Telepítés"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "A ''stable'' kiadásmenedzsere"
-#~ msgid "Delegates"
-#~ msgstr "Képviselők"
+#~ msgid "APT Team"
+#~ msgstr "APT-team"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Ez még nem hivatalos belő Debian projekt, de bejelentette az igényét az "
-#~ "integrációra."
+#~ msgid "Handhelds"
+#~ msgstr "Tenyérgépek"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian multimédia"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Levelezőlista-archívumok"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux a vállalkozási informatikában"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Kulcsaláírás-koordinátorok"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian a nonprofit cégek számára"
+#~ msgid "Accountant"
+#~ msgstr "Könyvelő"
#~ msgid "The Universal Operating System as your Desktop"
#~ msgstr "Az univerzális asztali operációs rendszer"
-#~ msgid "Accountant"
-#~ msgstr "Könyvelő"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian a nonprofit cégek számára"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Kulcsaláírás-koordinátorok"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux a vállalkozási informatikában"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Levelezőlista-archívumok"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian multimédia"
-#~ msgid "Handhelds"
-#~ msgstr "Tenyérgépek"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Ez még nem hivatalos belő Debian projekt, de bejelentette az igényét az "
+#~ "integrációra."
-#~ msgid "APT Team"
-#~ msgstr "APT-team"
+#~ msgid "Delegates"
+#~ msgstr "Képviselők"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "A ''stable'' kiadásmenedzsere"
+#~ msgid "Installation"
+#~ msgstr "Telepítés"
-#~ msgid "Release Assistants"
-#~ msgstr "Kiadás asszisztensek"
+#~ msgid "Mailing list"
+#~ msgstr "Levelezőlista"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Testre szabott Debian disztribúciók"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "A \"stable\" telepítőrendszere"
+
+#~ msgid "Internal Projects"
+#~ msgstr "Belső projektek"
+
+#~ msgid "Vendors"
+#~ msgstr "Terjesztők"
#, fuzzy
-#~| msgid "Security Testing Team"
-#~ msgid "Marketing Team"
-#~ msgstr "Biztonsági tesztelő csoport"
+#~| msgid "New Maintainers Front Desk"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Új karbantartók felvétele"
-#~ msgid "Security Audit Project"
-#~ msgstr "Biztonsági ellenőrzési projekt"
+#~ msgid "Publicity"
+#~ msgstr "Sajtó és nyilvánosság"
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "Biztonsági csoport"
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "A telepítési rendszer karbantartói"
diff --git a/hungarian/po/others.hu.po b/hungarian/po/others.hu.po
index 6b17d33fb51..c6d6558aa51 100644
--- a/hungarian/po/others.hu.po
+++ b/hungarian/po/others.hu.po
@@ -268,8 +268,9 @@ msgstr "Miért kezdél a Debian-nal foglalkozni?"
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?"
+msgstr ""
+"Van ötleted olyan hölgyeknek, akik mélyebben szeretnek Debian-nal "
+"foglalkozni?"
#: ../../english/women/profiles/profiles.def:39
msgid ""
@@ -324,26 +325,35 @@ msgstr "Verzió"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Név:"
+#~ msgid "Wanted:"
+#~ msgstr "Keressük"
-#~ msgid "Company:"
-#~ msgstr "Cég:"
+#~ msgid "Who:"
+#~ msgstr "Ki:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Architecture:"
+#~ msgstr "Architektúra:"
-#~ msgid "or"
-#~ msgstr "vagy"
+#~ msgid "Specifications:"
+#~ msgstr "Specifikációk:"
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
+#~ msgid "Where:"
+#~ msgstr "Hol:"
-#~ msgid "Rates:"
-#~ msgstr "Árak:"
+#~ msgid "Older Debian banners"
+#~ msgstr "Régebbi Debian-bannerek"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Bárhol hajlandó"
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "mozgó GIF-banner"
+
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "vízszintes banner"
+
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "függőleges banner"
+
+#~ msgid "Q"
+#~ msgstr "K"
#~ msgid ""
#~ "<total_consultant> Debian consultants listed in <total_country> countries "
@@ -351,32 +361,23 @@ msgstr "URL"
#~ msgstr ""
#~ "A világ <total_country> országának <total_consultant> Debian-tanácsadója"
-#~ msgid "Q"
-#~ msgstr "K"
-
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "függőleges banner"
-
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "vízszintes banner"
-
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "mozgó GIF-banner"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Bárhol hajlandó"
-#~ msgid "Older Debian banners"
-#~ msgstr "Régebbi Debian-bannerek"
+#~ msgid "Rates:"
+#~ msgstr "Árak:"
-#~ msgid "Where:"
-#~ msgstr "Hol:"
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
-#~ msgid "Specifications:"
-#~ msgstr "Specifikációk:"
+#~ msgid "or"
+#~ msgstr "vagy"
-#~ msgid "Architecture:"
-#~ msgstr "Architektúra:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Who:"
-#~ msgstr "Ki:"
+#~ msgid "Company:"
+#~ msgstr "Cég:"
-#~ msgid "Wanted:"
-#~ msgstr "Keressük"
+#~ msgid "Name:"
+#~ msgstr "Név:"
diff --git a/hungarian/po/partners.hu.po b/hungarian/po/partners.hu.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/hungarian/po/partners.hu.po
+++ b/hungarian/po/partners.hu.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/hungarian/po/ports.hu.po b/hungarian/po/ports.hu.po
index 7341155efd0..77b5bfcc58f 100644
--- a/hungarian/po/ports.hu.po
+++ b/hungarian/po/ports.hu.po
@@ -113,32 +113,32 @@ msgstr "Debian PowerPC-re"
msgid "Debian for Sparc"
msgstr "Debian Sparc-ra"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian laptopokra"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64-re"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64-re"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARM-ra"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390-re"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Bebian Beowolf-ra"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPS-re"
-#~ msgid "Main"
-#~ msgstr "Fő"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0-ra"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debain GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0-ra"
+#~ msgid "Main"
+#~ msgstr "Fő"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPS-re"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Bebian Beowolf-ra"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390-re"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARM-ra"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64-re"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64-re"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian laptopokra"
diff --git a/hungarian/po/stats.hu.po b/hungarian/po/stats.hu.po
index cf863df1dad..fbd8552b025 100644
--- a/hungarian/po/stats.hu.po
+++ b/hungarian/po/stats.hu.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/hungarian/po/templates.hu.po b/hungarian/po/templates.hu.po
index 3fed095dfda..fe2b4158a48 100644
--- a/hungarian/po/templates.hu.po
+++ b/hungarian/po/templates.hu.po
@@ -210,11 +210,11 @@ msgstr ""
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"A weboldalainkkal kapcsolatos problémákat a <a href=\"mailto:debian-"
"www@lists.debian.org\">debian-www@lists.debian.org</a> címen jelentheted. "
@@ -520,6 +520,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Megjegyzés:</em> Az eredeti oldal már nem létezik."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -528,129 +532,101 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Vissza a <a href=\"./\">ki használja a Debiant oldalra</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Konzultánsok névsora"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Vissza a <a href=\"./\">Debian-konzultánsok oldalára</a>."
-
-#~ msgid "Network Install"
-#~ msgstr "Hálózati telepítés"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Szponzorokat keresünk"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Vita tárgya"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Szavazás alatt"
-
-#~ msgid "Decided"
-#~ msgstr "Eldőlt"
-
-#~ msgid "Other"
-#~ msgstr "Egyéb"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Kezdőoldal - Szavazás"
-
-#~ msgid "How&nbsp;To"
-#~ msgstr "Hogyan"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Adj be indítványt"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Látogasd meg szponzorainkat!"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Módosíts indítványt"
+#~ msgid "Select a server near you"
+#~ msgstr "Válassz hozzád közeli szervert"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Kövess indítványt"
+#~ msgid "More information"
+#~ msgstr "Bővebb információ"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Olvasd el a végeredményt"
+#~ msgid "More Info"
+#~ msgstr "Bővebb információ"
-#~ msgid "Vote"
-#~ msgstr "Szavazz"
+#~ msgid "Related Links"
+#~ msgstr "Kapcsolódó linkek"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Vissza a többi <a href=\"./\">Debian-hírre</a>."
+#~ msgid "Latest News"
+#~ msgstr "Legfrissebb hírek"
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr ""
-#~ "Ha fel akarod venni velünk a kapcsolatot, látogass el <a href=\"m4_HOME/"
-#~ "contact\">ide</a>!"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Architektúrafüggetlen komponens:"
-
-#~ msgid "Source:"
-#~ msgstr "Forrás:"
-
-#~ msgid "Fixed in"
-#~ msgstr "Kijavítása"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Sebezhető"
+#~ "Vissza a többi <a href=\"./\">Debian-hírhez</a> || a <a href=\"m4_HOME/"
+#~ "\">Debian projekt kezdőoldalára</a>."
-#~ msgid "Date Reported"
-#~ msgstr "Bejelentés dátuma"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (nem működő hivatkozás)"
+#, fuzzy
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Martin 'Joey' "
-#~ "Schulze</a> szerkeszti."
+#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Yooseong Yang és "
-#~ "Martin 'Joey' Schulze</a> szerkeszti."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "<a href=\"../..\">Korábbi híreink</a>"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
-#~ "Brockmeier és Martin 'Joey' Schulze</a> szerkeszti."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
-#~ "Brockmeier, Jean-Christophe Helary és Tollef Fog Heen</a> szerkeszti."
-
-#~ msgid "Discussion"
-#~ msgstr "Vita"
-
-#~ msgid "License Information"
-#~ msgstr "Licencinformáció"
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Vissza a <a href=\"./\">Debian-előadók oldalára</a>."
+
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
#~ msgid ""
#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
@@ -659,97 +635,125 @@ msgstr "Vissza a <a href=\"./\">ki használja a Debiant oldalra</a>."
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
-
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Vissza a <a href=\"./\">Debian-előadók oldalára</a>."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
+#~ msgid "License Information"
+#~ msgstr "Licencinformáció"
+
+#~ msgid "Discussion"
+#~ msgstr "Vita"
+
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
+#~ "Brockmeier, Jean-Christophe Helary és Tollef Fog Heen</a> szerkeszti."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
+#~ "Brockmeier és Martin 'Joey' Schulze</a> szerkeszti."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "<a href=\"../..\">Korábbi híreink</a>"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Yooseong Yang és "
+#~ "Martin 'Joey' Schulze</a> szerkeszti."
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
+#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Martin 'Joey' "
+#~ "Schulze</a> szerkeszti."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (nem működő hivatkozás)"
+#~ msgid "Date Reported"
+#~ msgstr "Bejelentés dátuma"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Sebezhető"
+
+#~ msgid "Fixed in"
+#~ msgstr "Kijavítása"
+
+#~ msgid "Source:"
+#~ msgstr "Forrás:"
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Architektúrafüggetlen komponens:"
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ "Vissza a többi <a href=\"./\">Debian-hírhez</a> || a <a href=\"m4_HOME/"
-#~ "\">Debian projekt kezdőoldalára</a>."
+#~ "Ha fel akarod venni velünk a kapcsolatot, látogass el <a href=\"m4_HOME/"
+#~ "contact\">ide</a>!"
-#~ msgid "Latest News"
-#~ msgstr "Legfrissebb hírek"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Vissza a többi <a href=\"./\">Debian-hírre</a>."
-#~ msgid "Related Links"
-#~ msgstr "Kapcsolódó linkek"
+#~ msgid "Vote"
+#~ msgstr "Szavazz"
-#~ msgid "More Info"
-#~ msgstr "Bővebb információ"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Olvasd el a végeredményt"
-#~ msgid "More information"
-#~ msgstr "Bővebb információ"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Kövess indítványt"
-#~ msgid "Select a server near you"
-#~ msgstr "Válassz hozzád közeli szervert"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Módosíts indítványt"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Látogasd meg szponzorainkat!"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Adj be indítványt"
+
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hogyan"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Kezdőoldal - Szavazás"
+
+#~ msgid "Other"
+#~ msgstr "Egyéb"
+
+#~ msgid "Decided"
+#~ msgstr "Eldőlt"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Szavazás alatt"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Vita tárgya"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Szponzorokat keresünk"
+
+#~ msgid "Network Install"
+#~ msgstr "Hálózati telepítés"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Vissza a <a href=\"./\">Debian-konzultánsok oldalára</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Konzultánsok névsora"
diff --git a/hungarian/po/vendors.hu.po b/hungarian/po/vendors.hu.po
index 52cbe7dc5d1..8bef6deb4a2 100644
--- a/hungarian/po/vendors.hu.po
+++ b/hungarian/po/vendors.hu.po
@@ -67,74 +67,74 @@ msgstr "forrás"
msgid "and"
msgstr "és"
-#~ msgid "updated monthly"
-#~ msgstr "havonta frissítve"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "kéthetente frissítve"
+#~ msgid "Vendor:"
+#~ msgstr "Eladó:"
-#~ msgid "updated weekly"
-#~ msgstr "hetente frissítve"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian oldal címe:"
-#~ msgid "reseller"
-#~ msgstr "viszonteladó"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Lehetővé teszi a Debian támogatását:"
-#~ msgid "reseller of $var"
-#~ msgstr "$var viszonteladója"
+#~ msgid "Country:"
+#~ msgstr "Ország:"
-#~ msgid "Custom Release"
-#~ msgstr "Egyéni változat"
+#~ msgid "Ship International:"
+#~ msgstr "Nemzetközi szállítás:"
-#~ msgid "vendor additions"
-#~ msgstr "eladói bővítmények"
+#~ msgid "email:"
+#~ msgstr "e-mail:"
-#~ msgid "contrib included"
-#~ msgstr "tartalmazza a contrib-ot"
+#~ msgid "CD Type:"
+#~ msgstr "CD típusa:"
-#~ msgid "non-free included"
-#~ msgstr "tartalmazza a non-free-t"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD Típusa:"
-#~ msgid "non-US included"
-#~ msgstr "tartalmazza a non-US-t"
+#~ msgid "Architectures:"
+#~ msgstr "Architektúrák:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Többsuörös disztribúció"
+#~ msgid "Official CD"
+#~ msgstr "Hivatalos CD"
-#~ msgid "Vendor Release"
-#~ msgstr "Eladói változat"
+#~ msgid "Official DVD"
+#~ msgstr "Hivatalos DVD"
#~ msgid "Development Snapshot"
#~ msgstr "Fejlesztési pillanatkép"
-#~ msgid "Official DVD"
-#~ msgstr "Hivatalos DVD"
+#~ msgid "Vendor Release"
+#~ msgstr "Eladói változat"
-#~ msgid "Official CD"
-#~ msgstr "Hivatalos CD"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Többsuörös disztribúció"
-#~ msgid "Architectures:"
-#~ msgstr "Architektúrák:"
+#~ msgid "non-US included"
+#~ msgstr "tartalmazza a non-US-t"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD Típusa:"
+#~ msgid "non-free included"
+#~ msgstr "tartalmazza a non-free-t"
-#~ msgid "CD Type:"
-#~ msgstr "CD típusa:"
+#~ msgid "contrib included"
+#~ msgstr "tartalmazza a contrib-ot"
-#~ msgid "email:"
-#~ msgstr "e-mail:"
+#~ msgid "vendor additions"
+#~ msgstr "eladói bővítmények"
-#~ msgid "Ship International:"
-#~ msgstr "Nemzetközi szállítás:"
+#~ msgid "Custom Release"
+#~ msgstr "Egyéni változat"
-#~ msgid "Country:"
-#~ msgstr "Ország:"
+#~ msgid "reseller of $var"
+#~ msgstr "$var viszonteladója"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Lehetővé teszi a Debian támogatását:"
+#~ msgid "reseller"
+#~ msgstr "viszonteladó"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Debian oldal címe:"
+#~ msgid "updated weekly"
+#~ msgstr "hetente frissítve"
-#~ msgid "Vendor:"
-#~ msgstr "Eladó:"
+#~ msgid "updated twice weekly"
+#~ msgstr "kéthetente frissítve"
+
+#~ msgid "updated monthly"
+#~ msgstr "havonta frissítve"
diff --git a/indonesian/po/blends.id.po b/indonesian/po/blends.id.po
index 1cf516bbdc0..ce4b2ec168b 100644
--- a/indonesian/po/blends.id.po
+++ b/indonesian/po/blends.id.po
@@ -26,13 +26,26 @@ msgstr "Turunan"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Tujuan dari Debian Astro adalah untuk mengembangkan sistem operasi berbasis "
+"Debian yang sesuai dengan persyaratan dari kalangan profesional dan para "
+"pencinta astronomi. Ini mengintegrasikan sejumlah besar paket perangkat "
+"lunak yang meliputi kontrol teleskop, reduksi data, presentasi dan bidang "
+"lainnya."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"Tujuan dari DebiChem adalah untuk membuat platform Debian yang baik untuk "
"ahli kimia dalam pekerjaan sehari-hari mereka."
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
#, fuzzy
#| msgid ""
#| "The goal of Debian Games is to provide games in Debian from arcade and "
@@ -44,7 +57,7 @@ msgstr ""
"Tujuan dari Debian Games adalah untuk memberikan permainan di Debian dari "
"arcade dan petualangan untuk simulasi dan strategi."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -52,7 +65,7 @@ msgstr ""
"Tujuan dari Debian Edu adalah untuk menyediakan sistem Debian OS yang cocok "
"digunakan untuk pendidikan dan di sekolah-sekolah."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -60,7 +73,7 @@ msgstr ""
"Tujuan dari Debian GIS adalah untuk mengembangkan Debian menjadi distribusi "
"terbaik untuk aplikasi Sistem Informasi Geografis dan pengguna."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -68,7 +81,7 @@ msgstr ""
"Tujuan dari Debian Junior untuk membuat OS Debian agar anak-anak menikmati "
"dalam menggunakannya."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -81,7 +94,7 @@ msgstr ""
"terkait untuk pencitraan medis, bioinformatika, infrastruktur klinik IT, dan "
"lain-lain dalam OS Debian."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -89,7 +102,7 @@ msgstr ""
"Tujuan dari Debian Multimedia adalah untuk membuat platform Debian yang baik "
"untuk pekerjaan audio dan multimedia."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -108,26 +121,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Tujuan dari Debian Astro adalah untuk mengembangkan sistem operasi berbasis "
-"Debian yang sesuai dengan persyaratan dari kalangan profesional dan para "
-"pencinta astronomi. Ini mengintegrasikan sejumlah besar paket perangkat "
-"lunak yang meliputi kontrol teleskop, reduksi data, presentasi dan bidang "
-"lainnya."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Tujuan dari Debian Desain adalah untuk menyediakan aplikasi untuk desainer. "
"Ini termasuk desain grafis, desain web dan desain multimedia."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -142,7 +142,7 @@ msgstr ""
"pengembangan teknologi di banyak daerah dan wilayah, seperti Afrika, "
"Afganistan, Indonesia, Vietnam yang menggunakan Debian."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -156,7 +156,7 @@ msgstr ""
"proxy dan relay Tor pada perangkat yang dapat menggantikan router nirkabel "
"sehingga data tetap berada pada pengguna."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -165,7 +165,7 @@ msgstr ""
"Debian dengan menyediakan logging, modus data dan aplikasi modus paket dan "
"banyak lagi."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -173,8 +173,8 @@ msgstr ""
"Tujuan dari DebianParl adalah untuk menyediakan aplikasi untuk mendukung "
"kebutuhan anggota parlemen, politisi dan staf mereka di seluruh dunia."
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Aksesibilitas Debian"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games"
diff --git a/indonesian/po/distrib.id.po b/indonesian/po/distrib.id.po
index f7f02bed2d7..89aca186006 100644
--- a/indonesian/po/distrib.id.po
+++ b/indonesian/po/distrib.id.po
@@ -210,52 +210,52 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
-
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paket yang mengandung berkas atau direktory seperti ini"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "all files in this package"
+#~ msgstr "semua berkas di paket ini"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "Case sensitive"
+#~ msgstr "Perhatikan jenis huruf"
-#, fuzzy
-#~| msgid "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "Intel x86"
+#~ msgid "no"
+#~ msgstr "tidak"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "yes"
+#~ msgstr "ya"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Search case sensitive"
-#~ msgstr "Search case sensitive"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
#~ msgid "Allow searching on subwords"
#~ msgstr "Perbolehkan pencarian dengan sub kata kunci"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "Search case sensitive"
+#~ msgstr "Search case sensitive"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "yes"
-#~ msgstr "ya"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "no"
-#~ msgstr "tidak"
+#, fuzzy
+#~| msgid "Intel x86"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "Intel x86"
-#~ msgid "Case sensitive"
-#~ msgstr "Perhatikan jenis huruf"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "all files in this package"
-#~ msgstr "semua berkas di paket ini"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "paket yang mengandung berkas atau direktory seperti ini"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
+
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/indonesian/po/doc.id.po b/indonesian/po/doc.id.po
index 4759e76e794..da1da5ae2a9 100644
--- a/indonesian/po/doc.id.po
+++ b/indonesian/po/doc.id.po
@@ -30,8 +30,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -61,46 +61,7 @@ msgstr ""
" dasar untuk pengguna yang menginstall dan memelihara sistemnya sendiri\n"
" (baik itu di rumah, kantor, klub, atau sekolah)."
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 arsitektur ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-"Buku ini untuk para pengembang yang bekerja dengan GNU/Linux di prosesor "
-"ARM.\n"
-" Mencakup beberapa perangkat khusus untuk mengatur secara cepat (LART,\n"
-" Assabet, Psion5). Buku juga memberikan informasi umum, alat dan teknik. "
-"GNU\n"
-" toolchain termasuk pada bentuk asli dan cross-compiler form, seperti\n"
-" bootloader, kernel patch, RAMdisk, keanehan ARM dan sumber daya ARM "
-"lainnya.\n"
-" Buku ini juga mencakup informasi tutorial ekstensif pada GNU/Linux "
-"standar\n"
-" untuk pengembang dari platform lain.\n"
-" Hal ini tidak spesifik untuk Debian, tetapi distribusi Aleph ARMLinux "
-"sangat\n"
-" mirip/dekat berbasis Debian-ARM dan mengasumsikan Anda akan bekerja dari\n"
-" distribusi ini dan sebaiknya memiliki mesin host berbasis Debian juga."
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -122,7 +83,7 @@ msgstr ""
"dengan\n"
" Debian."
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -134,7 +95,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -142,6 +103,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Penulis:"
@@ -194,13 +171,13 @@ msgstr "(versi <get-var version />)"
msgid "plain text"
msgstr "plain text"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
-"www.debian.org/doc/cvs\">Subversion</a>."
+"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
@@ -228,14 +205,6 @@ msgstr ""
"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
"packages.debian.org/subversion\">Subversion</a>."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
-"packages.debian.org/git\">Git</a>."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -266,182 +235,125 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "Sebuah alternatif <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publikasi</a> tersedia dari Lehmanns Fachbuchhandlung dan harganya "
-#~ "29.95\n"
-#~ " &euro; (pada tahun 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Gunakan <a href=\"cvs\">SVN</a> untuk mengunduh sumber text SGML untuk "
-#~ "<get-var ddp_pkg_loc />."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD Sarge CD dengan installer dan paket pilihan"
-#~ msgid "Language:"
-#~ msgstr "Bahasa:"
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live CD dengan Knoppix"
#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Buku ini dibagi menjadi empat bagian: Konsep dasar, Manajemen GNU/Linux,\n"
-#~ " Administrasi sistem dan operasi lanjutan. Setiap bagian menjelaskan\n"
-#~ " secara mendalam tentang fitur-fitur sistem operasi. Bagian pertama\n"
-#~ " menjelaskan struktur GNU/Linux. Bagian ini akan membantu pembaca untuk\n"
-#~ " memahami bagaimana sistem menggunakan sumber daya utama seperti "
-#~ "prosesor\n"
-#~ " dan memori. Analisis mendalam tentang filesistem seperti ext2, ext3, "
-#~ "dan\n"
-#~ " ReiserFS akan memudahkan pengguna mengambil pilihan yang tepat untuk\n"
-#~ " kebutuhannya. Banyak penjelasan dalam buku menunjukkan aspek tentang\n"
-#~ " kinerja sistem operasi. Buku ini memberikan pelayanan bagi mahasiswa\n"
-#~ " dan siapa saja yang ingin belajar GNU/Linux secara mendalam. Buku ini\n"
-#~ " Mencakup Debian Sarge."
+#~ "Pemula dan pengguna mahir akan sama-sama menemukan buku ini sebagai "
+#~ "sumber\n"
+#~ " informasi yang komprehensif menggunakan Debian untuk desktop, "
+#~ "intranet,\n"
+#~ " dan server internet, dan pengembangan. Hal ini juga berisi latar "
+#~ "belakang\n"
+#~ " informasi tentang proyek dan cakupan luas sistem manajemen paket unik "
+#~ "Debian."
+
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "Debian GNU/Linux 3.1r0a \"sarge\" resmi dalam DVD (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Buku Persia pertama tentang Debian GNU/Linux. Buku ini membantu Anda\n"
-#~ " untuk menginstall Debian GNU/Linux dan mengatur servis jaringan "
-#~ "seperti\n"
-#~ " web, database, firewall, mail, ftp dan ..... pada Debian. Juga "
-#~ "membantu\n"
-#~ " Anda untuk memulai menggunakan GNU/Linux dan sistem manajer paket "
-#~ "Debian\n"
-#~ " yang powerfull."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Buku ini memperkenalkan konsep dan teknik sistem operasi Debian, "
+#~ "menjelaskan\n"
+#~ " penggunaan dan perangkap, dan menggambarkan pemikiran di balik masing-\n"
+#~ " masing pendekatan. Tujuannya adalah tidak untuk menjadi buku "
+#~ "referensi,\n"
+#~ " tetapi untuk memberikan pembaca wawasan yang cukup ke dalam kerja "
+#~ "proyek dan\n"
+#~ " dan sistem operasi untuk belajar dan mencakup kecanggihan dan elegan,\n"
+#~ " kadang-kadang pada awalnya sedikit non-intuitif solusi yang telah "
+#~ "berevolusi\n"
+#~ " sebagai bagian dari sistem Debian selama dekade terakhir. Ketika\n"
+#~ " ditargetkan pada administrator GNU/Linux yang berpengalaman, buku ini "
+#~ "juga\n"
+#~ " dapat berfungsi sangat baik sebagai sumber daya bersama referensi "
+#~ "Linux\n"
+#~ " standar untuk orang yang berpengalaman dalam bootstrap dalam filsafat "
+#~ "Debian."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Buku ini memperkenalkan pembaca pada Debian GNU/Linux dengan berbagai\n"
-#~ " tutorial dan tips. Ditulis dalam bahasa Korea, buku ini mencakup aspek\n"
-#~ " komprehensif sistem Debian GNU/Linux: konfigurasi awal, instalasi "
-#~ "paket,\n"
-#~ " konfigurasi X, menghubungkan ke internet, perbaikan jaringan, dan "
-#~ "masih\n"
-#~ " banyak lagi. Buku ini memberikan beberapa tips tentang pengaturan "
-#~ "Debian\n"
-#~ " untuk lingkungan bahasa Korea, dan juga bagus untuk pendatang baru."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Tiga CD potato r3 resmi dan sebuah CD woody tidak resmi"
+#~ "Pegangan panduan referensi sistem Debian GNU/Linux yang menunjukkan "
+#~ "lebih\n"
+#~ " dari 1.500 <q>resep</q>, bagaimana menggunakannya untuk aktifitas "
+#~ "sehari-hari --\n"
+#~ " dari bekerja dengan teks, gambar, dan suara untuk produktifitas dan isu-"
+#~ "isu\n"
+#~ " jaringan. Seperti perangkat lunak yang dijelaskan, buku ini adalah "
+#~ "copyleft\n"
+#~ " dan data sumbernya tersedia."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Buku ini memberikan gambaran panduan untuk menginstall Debian GNU/Linux,\n"
-#~ " perintah-perintah Unix atau Linux yang fundamental, konfigurasi standar "
-#~ "dan\n"
-#~ " perbaikan sistem dan jaringan, pengaturan sistem X window, dan "
-#~ "penggunaan\n"
-#~ " multimedia di Debian GNU/Linux.\n"
-#~ " Buku ini juga menyertakan panduan untuk maintainer, yang mensimulasi\n"
-#~ " orang di Korea untuk menjadi maintainer resmi Debian."
+#~ "Panduan belajar Debian GNU/Linux bagi pengguna baru Linux melalui "
+#~ "instalasi\n"
+#~ " dan konfigurasi Debian GNU/Linux. Pengguna Windows akan mendapatkan "
+#~ "pengenalan\n"
+#~ " tentang menariknya dunia komputasi yang dipandu oleh Bill McCarty pada\n"
+#~ " <q>Learning Debian GNU/Linux</q>."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 unofficial Woody, 3 Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Buku ini mencakup topik umum tentang Debian GNU/Linux:\n"
-#~ " instalasi, APT dan dpkg, shell, Sistem X Window, jaringan, "
-#~ "administrasi\n"
-#~ " sistem, kernel setup, sharing dengan windows, membangun server dan "
-#~ "masih\n"
-#~ " banyak lagi.\n"
-#~ " Anda akan dapat menginstall dan memulai menggunakan Debian GNU/Linux\n"
-#~ " lingkungan (berbahasa) Jepang sangat mudah dengan CD yang dikostumisasi."
+#~ "Termasuk 230+ halaman dan tiga kepin CD-ROM. Topik yang dibahas oleh "
+#~ "perangkat\n"
+#~ " lunak termasuk Debian Linux, jaringan, tool pemrograman, GUI, desktop\n"
+#~ " publishing, bisnis, hal-hal menyenangkan, dan multimedia. Termasuk "
+#~ "dukungan\n"
+#~ " 30 hari e-mail gratis."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 edisi penulist (3 CD)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Ini adalah buku terbaru untuk Sarge dari seri yang telah didukung "
-#~ "sebagai\n"
-#~ " standar buku Debian di Jepang. Buku ini mencakup semua aspek "
-#~ "menggunakan\n"
-#~ " Debian GNU/Linux 3.1 Sarge, seperti instalasi, lingkungan desktop,\n"
-#~ " administrasi sistem, dan konfigurasi server. Selanjutnya, buku ini "
-#~ "juga\n"
-#~ " mencakup paket font komersial yang menghias desktop Anda. Buku ini "
-#~ "mungkin\n"
-#~ " berguna untuk semua pengguna Debian dari pemula sampai pengguna "
-#~ "tingkat\n"
-#~ " lanjut."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 edisi: satu tanpa DVD, yang lainnya dengan 2 DVD (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 dan amd64) dalam DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Buku ini bergaya kamus dan mencakup berbagai macam tips untuk pemula dan\n"
-#~ " pengguna yang trampil; instalasi dengan berbagai macam cara, "
-#~ "kostumisasi\n"
-#~ " desktop, troubleshooting, 'Tahukan Anda' yang bermanfaat dan lain "
-#~ "sebagainya."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ "2 edisi: Satu tanpa CD, lainnya dengan CD Resmi (i386, contrib dan sumber)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -477,122 +389,225 @@ msgstr "PDF"
#~ " pembangunan dial-in router atau server untuk klien berbasis windows "
#~ "(samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "2 edisi: Satu tanpa CD, lainnya dengan CD Resmi (i386, contrib dan sumber)"
+#~ "Buku ini bergaya kamus dan mencakup berbagai macam tips untuk pemula dan\n"
+#~ " pengguna yang trampil; instalasi dengan berbagai macam cara, "
+#~ "kostumisasi\n"
+#~ " desktop, troubleshooting, 'Tahukan Anda' yang bermanfaat dan lain "
+#~ "sebagainya."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 dan amd64) dalam DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 edisi: satu tanpa DVD, yang lainnya dengan 2 DVD (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Ini adalah buku terbaru untuk Sarge dari seri yang telah didukung "
+#~ "sebagai\n"
+#~ " standar buku Debian di Jepang. Buku ini mencakup semua aspek "
+#~ "menggunakan\n"
+#~ " Debian GNU/Linux 3.1 Sarge, seperti instalasi, lingkungan desktop,\n"
+#~ " administrasi sistem, dan konfigurasi server. Selanjutnya, buku ini "
+#~ "juga\n"
+#~ " mencakup paket font komersial yang menghias desktop Anda. Buku ini "
+#~ "mungkin\n"
+#~ " berguna untuk semua pengguna Debian dari pemula sampai pengguna "
+#~ "tingkat\n"
+#~ " lanjut."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edisi penulist (3 CD)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Termasuk 230+ halaman dan tiga kepin CD-ROM. Topik yang dibahas oleh "
-#~ "perangkat\n"
-#~ " lunak termasuk Debian Linux, jaringan, tool pemrograman, GUI, desktop\n"
-#~ " publishing, bisnis, hal-hal menyenangkan, dan multimedia. Termasuk "
-#~ "dukungan\n"
-#~ " 30 hari e-mail gratis."
+#~ "Buku ini mencakup topik umum tentang Debian GNU/Linux:\n"
+#~ " instalasi, APT dan dpkg, shell, Sistem X Window, jaringan, "
+#~ "administrasi\n"
+#~ " sistem, kernel setup, sharing dengan windows, membangun server dan "
+#~ "masih\n"
+#~ " banyak lagi.\n"
+#~ " Anda akan dapat menginstall dan memulai menggunakan Debian GNU/Linux\n"
+#~ " lingkungan (berbahasa) Jepang sangat mudah dengan CD yang dikostumisasi."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 unofficial Woody, 3 Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "Panduan belajar Debian GNU/Linux bagi pengguna baru Linux melalui "
-#~ "instalasi\n"
-#~ " dan konfigurasi Debian GNU/Linux. Pengguna Windows akan mendapatkan "
-#~ "pengenalan\n"
-#~ " tentang menariknya dunia komputasi yang dipandu oleh Bill McCarty pada\n"
-#~ " <q>Learning Debian GNU/Linux</q>."
+#~ "Buku ini memberikan gambaran panduan untuk menginstall Debian GNU/Linux,\n"
+#~ " perintah-perintah Unix atau Linux yang fundamental, konfigurasi standar "
+#~ "dan\n"
+#~ " perbaikan sistem dan jaringan, pengaturan sistem X window, dan "
+#~ "penggunaan\n"
+#~ " multimedia di Debian GNU/Linux.\n"
+#~ " Buku ini juga menyertakan panduan untuk maintainer, yang mensimulasi\n"
+#~ " orang di Korea untuk menjadi maintainer resmi Debian."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Tiga CD potato r3 resmi dan sebuah CD woody tidak resmi"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Pegangan panduan referensi sistem Debian GNU/Linux yang menunjukkan "
-#~ "lebih\n"
-#~ " dari 1.500 <q>resep</q>, bagaimana menggunakannya untuk aktifitas "
-#~ "sehari-hari --\n"
-#~ " dari bekerja dengan teks, gambar, dan suara untuk produktifitas dan isu-"
-#~ "isu\n"
-#~ " jaringan. Seperti perangkat lunak yang dijelaskan, buku ini adalah "
-#~ "copyleft\n"
-#~ " dan data sumbernya tersedia."
+#~ "Buku ini memperkenalkan pembaca pada Debian GNU/Linux dengan berbagai\n"
+#~ " tutorial dan tips. Ditulis dalam bahasa Korea, buku ini mencakup aspek\n"
+#~ " komprehensif sistem Debian GNU/Linux: konfigurasi awal, instalasi "
+#~ "paket,\n"
+#~ " konfigurasi X, menghubungkan ke internet, perbaikan jaringan, dan "
+#~ "masih\n"
+#~ " banyak lagi. Buku ini memberikan beberapa tips tentang pengaturan "
+#~ "Debian\n"
+#~ " untuk lingkungan bahasa Korea, dan juga bagus untuk pendatang baru."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Buku ini memperkenalkan konsep dan teknik sistem operasi Debian, "
-#~ "menjelaskan\n"
-#~ " penggunaan dan perangkap, dan menggambarkan pemikiran di balik masing-\n"
-#~ " masing pendekatan. Tujuannya adalah tidak untuk menjadi buku "
-#~ "referensi,\n"
-#~ " tetapi untuk memberikan pembaca wawasan yang cukup ke dalam kerja "
-#~ "proyek dan\n"
-#~ " dan sistem operasi untuk belajar dan mencakup kecanggihan dan elegan,\n"
-#~ " kadang-kadang pada awalnya sedikit non-intuitif solusi yang telah "
-#~ "berevolusi\n"
-#~ " sebagai bagian dari sistem Debian selama dekade terakhir. Ketika\n"
-#~ " ditargetkan pada administrator GNU/Linux yang berpengalaman, buku ini "
-#~ "juga\n"
-#~ " dapat berfungsi sangat baik sebagai sumber daya bersama referensi "
-#~ "Linux\n"
-#~ " standar untuk orang yang berpengalaman dalam bootstrap dalam filsafat "
-#~ "Debian."
+#~ "Buku Persia pertama tentang Debian GNU/Linux. Buku ini membantu Anda\n"
+#~ " untuk menginstall Debian GNU/Linux dan mengatur servis jaringan "
+#~ "seperti\n"
+#~ " web, database, firewall, mail, ftp dan ..... pada Debian. Juga "
+#~ "membantu\n"
+#~ " Anda untuk memulai menggunakan GNU/Linux dan sistem manajer paket "
+#~ "Debian\n"
+#~ " yang powerfull."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Debian GNU/Linux 3.1r0a \"sarge\" resmi dalam DVD (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Buku ini dibagi menjadi empat bagian: Konsep dasar, Manajemen GNU/Linux,\n"
+#~ " Administrasi sistem dan operasi lanjutan. Setiap bagian menjelaskan\n"
+#~ " secara mendalam tentang fitur-fitur sistem operasi. Bagian pertama\n"
+#~ " menjelaskan struktur GNU/Linux. Bagian ini akan membantu pembaca untuk\n"
+#~ " memahami bagaimana sistem menggunakan sumber daya utama seperti "
+#~ "prosesor\n"
+#~ " dan memori. Analisis mendalam tentang filesistem seperti ext2, ext3, "
+#~ "dan\n"
+#~ " ReiserFS akan memudahkan pengguna mengambil pilihan yang tepat untuk\n"
+#~ " kebutuhannya. Banyak penjelasan dalam buku menunjukkan aspek tentang\n"
+#~ " kinerja sistem operasi. Buku ini memberikan pelayanan bagi mahasiswa\n"
+#~ " dan siapa saja yang ingin belajar GNU/Linux secara mendalam. Buku ini\n"
+#~ " Mencakup Debian Sarge."
+
+#~ msgid "Language:"
+#~ msgstr "Bahasa:"
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
#~ msgstr ""
-#~ "Pemula dan pengguna mahir akan sama-sama menemukan buku ini sebagai "
-#~ "sumber\n"
-#~ " informasi yang komprehensif menggunakan Debian untuk desktop, "
-#~ "intranet,\n"
-#~ " dan server internet, dan pengembangan. Hal ini juga berisi latar "
-#~ "belakang\n"
-#~ " informasi tentang proyek dan cakupan luas sistem manajemen paket unik "
-#~ "Debian."
+#~ "Gunakan <a href=\"cvs\">SVN</a> untuk mengunduh sumber text SGML untuk "
+#~ "<get-var ddp_pkg_loc />."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live CD dengan Knoppix"
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Sebuah alternatif <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publikasi</a> tersedia dari Lehmanns Fachbuchhandlung dan harganya "
+#~ "29.95\n"
+#~ " &euro; (pada tahun 2008)."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD Sarge CD dengan installer dan paket pilihan"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Sumber terbaru <get-var srctype /> tersedia di repositori <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Buku ini untuk para pengembang yang bekerja dengan GNU/Linux di prosesor "
+#~ "ARM.\n"
+#~ " Mencakup beberapa perangkat khusus untuk mengatur secara cepat (LART,\n"
+#~ " Assabet, Psion5). Buku juga memberikan informasi umum, alat dan teknik. "
+#~ "GNU\n"
+#~ " toolchain termasuk pada bentuk asli dan cross-compiler form, seperti\n"
+#~ " bootloader, kernel patch, RAMdisk, keanehan ARM dan sumber daya ARM "
+#~ "lainnya.\n"
+#~ " Buku ini juga mencakup informasi tutorial ekstensif pada GNU/Linux "
+#~ "standar\n"
+#~ " untuk pengembang dari platform lain.\n"
+#~ " Hal ini tidak spesifik untuk Debian, tetapi distribusi Aleph ARMLinux "
+#~ "sangat\n"
+#~ " mirip/dekat berbasis Debian-ARM dan mengasumsikan Anda akan bekerja "
+#~ "dari\n"
+#~ " distribusi ini dan sebaiknya memiliki mesin host berbasis Debian juga."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 arsitektur ARM"
diff --git a/indonesian/po/mailinglists.id.po b/indonesian/po/mailinglists.id.po
index f5684e2a1b2..42b1f0bff92 100644
--- a/indonesian/po/mailinglists.id.po
+++ b/indonesian/po/mailinglists.id.po
@@ -129,8 +129,8 @@ msgstr "buka"
msgid "closed"
msgstr "tertutup"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Silakan pilih milis mana yang anda ingin mendaftar:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Silakan pilih milis mana yang akan anda batalkan langganannya:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Silakan pilih milis mana yang anda ingin mendaftar:"
diff --git a/indonesian/po/organization.id.po b/indonesian/po/organization.id.po
index 1cdae4a6583..b88265b9910 100644
--- a/indonesian/po/organization.id.po
+++ b/indonesian/po/organization.id.po
@@ -78,24 +78,24 @@ msgid "Officers"
msgstr "Petugas"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribusi"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publikasi"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Dukungan dan infrastruktur"
@@ -112,227 +112,225 @@ msgstr "Ketua"
msgid "Technical Committee"
msgstr "Komisi Teknis"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekretaris"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Proyek Pengembangan"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Arsip FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Asisten FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Paket individu"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Menagement rilis"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Catatan Rilis"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Jaminan Kualitas"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Tim Instalasi Sistem"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Catatan Rilis"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD Image"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produksi"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Pengujian"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Dukungan dan infrastruktur"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Administrasi sistem"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentasi"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Daftar paket yang butuh dikerjakan dan paket yang diharapkan"
-#: ../../english/intro/organization.data:178
-#, fuzzy
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "Tim Instalasi Sistem"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Ports"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Konfigurasi Instimewa"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Laptop"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Firewall"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Sistem embedded"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Kontak press"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Halaman web"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Proyek Pengembangan"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Acara"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Komisi Teknis"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Program Partner"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Koordiasi donasi perangkat keras"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Dukungan pengguna"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Sistem Bug Tracking"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Asministrasi Milis"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "New Maintainers Front Desk"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Pengelola akun Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Pengelola Keyring (PGP dan GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Tim keamanan"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Halaman konsultan"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Halaman penyedia CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Peraturan"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Administrasi sistem"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -340,7 +338,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:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -350,117 +348,134 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">mesin Debian</a>, yang mengandung "
"informasi administrasi per mesin"
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator Direktori LDAP pengembang"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Cermin"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Pengelola DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Sistem tracking paket"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Administrator Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administrator Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian untuk anak kecil dari 1 sampai 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian untuk medis dan penelitian"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian untuk edukasi"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian di kantor hukum"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian untuk penyandang cacat"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian untuk medis dan penelitian"
-#~ msgid "Publicity"
-#~ msgstr "Publikasi"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian untuk edukasi"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Ini belum menjadi Proyek internal Debian tapi sudah diumumkan akan "
-#~ "disertakan "
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Tim keamanan"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribusi Debian Multimedia"
+#~ msgid "Security Audit Project"
+#~ msgstr "Proyek audit keamanan"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux untuk Komputasi Enterprise"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribusi Debian Racikan"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian untuk organisasi nirlaba"
+#~ msgid "Release Assistants"
+#~ msgstr "Asisten Rilis"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Sistem operasi universal sebagai desktop anda"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Manager rilis untuk ``stable''"
-#~ msgid "Accountant"
-#~ msgstr "Akuntan"
+#~ msgid "Vendors"
+#~ msgstr "Penyedia"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinasi penandatanganan kunci"
+#~ msgid "APT Team"
+#~ msgstr "Tim APT"
-#~ msgid "Security Testing Team"
-#~ msgstr "Tim penguji keamanan"
+#~ msgid "Handhelds"
+#~ msgstr "Handhelds"
#~ msgid "Mailing List Archives"
#~ msgstr "Arsip Milis"
-#~ msgid "Handhelds"
-#~ msgstr "Handhelds"
+#~ msgid "Security Testing Team"
+#~ msgstr "Tim penguji keamanan"
-#~ msgid "APT Team"
-#~ msgstr "Tim APT"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinasi penandatanganan kunci"
-#~ msgid "Vendors"
-#~ msgstr "Penyedia"
+#~ msgid "Accountant"
+#~ msgstr "Akuntan"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Manager rilis untuk ``stable''"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Sistem operasi universal sebagai desktop anda"
-#~ msgid "Release Assistants"
-#~ msgstr "Asisten Rilis"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian untuk organisasi nirlaba"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribusi Debian Racikan"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux untuk Komputasi Enterprise"
-#~ msgid "Security Audit Project"
-#~ msgstr "Proyek audit keamanan"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribusi Debian Multimedia"
+
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Ini belum menjadi Proyek internal Debian tapi sudah diumumkan akan "
+#~ "disertakan "
+
+#~ msgid "Publicity"
+#~ msgstr "Publikasi"
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "Tim keamanan"
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "Tim Instalasi Sistem"
diff --git a/indonesian/po/others.id.po b/indonesian/po/others.id.po
index dd5d26b9607..5a8928a7960 100644
--- a/indonesian/po/others.id.po
+++ b/indonesian/po/others.id.po
@@ -341,17 +341,17 @@ msgstr "Versi"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "Dimana:"
+#~ msgid "Wanted:"
+#~ msgstr "Dicari:"
-#~ msgid "Specifications:"
-#~ msgstr "Spesifikasi"
+#~ msgid "Who:"
+#~ msgstr "Siapa?"
#~ msgid "Architecture:"
#~ msgstr "Arsitektur:"
-#~ msgid "Who:"
-#~ msgstr "Siapa?"
+#~ msgid "Specifications:"
+#~ msgstr "Spesifikasi"
-#~ msgid "Wanted:"
-#~ msgstr "Dicari:"
+#~ msgid "Where:"
+#~ msgstr "Dimana:"
diff --git a/indonesian/po/partners.id.po b/indonesian/po/partners.id.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/indonesian/po/partners.id.po
+++ b/indonesian/po/partners.id.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/indonesian/po/stats.id.po b/indonesian/po/stats.id.po
index 484ccf3b79f..a474b2a744a 100644
--- a/indonesian/po/stats.id.po
+++ b/indonesian/po/stats.id.po
@@ -31,79 +31,90 @@ msgstr "Ada %d bytes untuk diterjemahkan."
msgid "There are %d strings to translate."
msgstr "Ada %d strings untuk diterjemahkan."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Terjemahan ini terlalu ketinggalan zaman"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Versi terjemahan yang salah"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Terjemahan ini terlalu ketinggalan zaman"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Aslinya lebih baru dari pada terjemahan ini"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Aslinya tidak ada lagi"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "jumlah hit N/A"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "hit"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Klik untuk mengambil data diffstat"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Unified diff"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Berwarna diff"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Berwarna diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Ringkasan terjemahan untuk"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Tidak diterjemahkan"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Telah usang"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Telah diterjemahkan"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Mutakhir"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "berkas"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -111,131 +122,131 @@ msgstr ""
"Catatan: daftar halaman diurutkan berdasarkan popularitas. Arahkan kursor ke "
"nama halaman untuk melihat jumlah hit."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Terjemahan telah usang"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Berkas"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Komentar"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Terjemahan"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Pemelihara"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Penerjemah"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Tanggal"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Halaman umum tidak diterjemahkan"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Halaman umum belum diterjemahkan"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Item berita tidak diterjemahkan"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Item berita belum diterjemahkan"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Halaman konsultan/pengguna tidak diterjemahkan"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Halaman konsultan/pengguna belum diterjemahkan"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Halaman internasional tidak diterjemahkan"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Halaman internasional belum diterjemahkan"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Halaman telah diterjemahkan (up-to-date)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Tema telah diterjemahkan (berkas PO)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Statistik Penerjemahan PO"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Ragu-Ragu"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Belum diterjemahkan"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Halaman web telah diterjemahkan"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Statistik Terjemahan berdasarkan Jumlah Halaman"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Bahasa"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Terjemahan"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Halaman web telah diterjemahkan (berdasarkan ukuran)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Statistik Terjemahan berdasarkan Ukuran Halaman"
diff --git a/indonesian/po/templates.id.po b/indonesian/po/templates.id.po
index 66231f394f7..44477cedbfd 100644
--- a/indonesian/po/templates.id.po
+++ b/indonesian/po/templates.id.po
@@ -207,11 +207,11 @@ msgstr "di Debian 2.2"
#. your language.
#: ../../english/template/debian/footer.wml:105
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
#: ../../english/template/debian/footer.wml:108
@@ -519,6 +519,10 @@ msgid ""
msgstr ""
"<em>Catatan:</em> Dokumen asli untuk terjemahan ini sudah tidak ada lagi."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr ""
@@ -528,158 +532,113 @@ msgstr ""
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
-#~ msgid "Select a server near you"
-#~ msgstr "Pilih server terdekat"
-
-#~ msgid "List of Consultants"
-#~ msgstr "Daftar Penasehat"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donasi"
-
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "telah diajukan"
-
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Sedang&nbsp;Didiskusikan"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Menunggu&nbsp;Sponsor"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Sponsor situs web"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Sedang&nbsp;Didiskusikan"
+#~ msgid "More information:"
+#~ msgstr "Informasi lainnya:"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Pemungutan&nbsp;Suara&nbsp;Berjalan"
+#~ msgid "More information"
+#~ msgstr "Informasi lebih lanjut"
-#~ msgid "Decided"
-#~ msgstr "Telah&nbsp;Diputuskan"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Acara mendatang"
-#~ msgid "Other"
-#~ msgstr "Lain-lain"
+#~ msgid "link may no longer be valid"
+#~ msgstr "link ini mungkin sudah kadaluwarsa"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Halaman&nbsp;Utama&nbsp;Pemungutan&nbsp;Suara"
+#~ msgid "When"
+#~ msgstr "Waktu"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Bagaimana"
+#~ msgid "Where"
+#~ msgstr "Tempat"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Mengajukan&nbsp;Proposal"
+#~ msgid "More Info"
+#~ msgstr "Informasi lebih lanjut"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Mengubah&nbsp;Proposal"
+#~ msgid "Debian Involvement"
+#~ msgstr "Partisipasi Debian"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Menindaklanjuti&nbsp;Proposal"
+#~ msgid "Main Coordinator"
+#~ msgstr "Koordinator Utama"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Lihat&nbsp;Hasil"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Koordinator</th><th>Proyek</th>"
-#~ msgid "Vote"
-#~ msgstr "Pilih"
+#~ msgid "Related Links"
+#~ msgstr "Info Lainnya"
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (link buntu)"
+#~ msgid "Latest News"
+#~ msgstr "Berita Terbaru"
+#, fuzzy
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Untuk menghubungi kami, silahkan lihat <a href=\"m4_HOME/contact"
-#~ "\">Halaman kontak</a> Debian."
-
-#~ msgid "discussed"
-#~ msgstr "telah didiskusikan"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Rawan"
-
-#~ msgid "Fixed in"
-#~ msgstr "Telah diperbaiki di"
-
-#~ msgid "Source:"
-#~ msgstr "Sumber"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Komponen yang Arsitektur-independen:"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "Kembali ke <a href=\"m4_HOME/\">Halaman Utama Proyek Debian</a>."
#, fuzzy
#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "Checksum MD5 untuk file-file terdaftar tersedia di <a href=\"%attributes"
-#~ "\">original advisory</a>."
+#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
+#~ "debian-news."
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "Edisi lama newsletter ini tersedia di <a href=\"../../\">sini</a>."
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</a>."
#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "tidak&nbsp;ada"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "Sedang&nbsp;Didiskusikan"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Informasi lebih lanjut"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Paket-paket Terkena Efek"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Informasi lebih lanjut"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
+#~ "debian-news."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</a>."
@@ -694,111 +653,156 @@ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
-#~ "debian-news."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
+#~ msgid "No requests for adoption"
+#~ msgstr "Informasi lebih lanjut"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ msgid "No Requested packages"
+#~ msgstr "Paket-paket Terkena Efek"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Informasi lebih lanjut"
+
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "Sedang&nbsp;Didiskusikan"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "tidak&nbsp;ada"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "Edisi lama newsletter ini tersedia di <a href=\"../../\">sini</a>."
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgstr ""
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
#~ msgstr ""
-#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
-#~ "debian-news."
+#~ "Checksum MD5 untuk file-file terdaftar tersedia di <a href=\"%attributes"
+#~ "\">original advisory</a>."
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Komponen yang Arsitektur-independen:"
+
+#~ msgid "Source:"
+#~ msgstr "Sumber"
+
+#~ msgid "Fixed in"
+#~ msgstr "Telah diperbaiki di"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Rawan"
+
+#~ msgid "discussed"
+#~ msgstr "telah didiskusikan"
-#, fuzzy
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "Kembali ke <a href=\"m4_HOME/\">Halaman Utama Proyek Debian</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Untuk menghubungi kami, silahkan lihat <a href=\"m4_HOME/contact"
+#~ "\">Halaman kontak</a> Debian."
-#~ msgid "Latest News"
-#~ msgstr "Berita Terbaru"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (link buntu)"
-#~ msgid "Related Links"
-#~ msgstr "Info Lainnya"
+#~ msgid "Vote"
+#~ msgstr "Pilih"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Koordinator</th><th>Proyek</th>"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Lihat&nbsp;Hasil"
-#~ msgid "Main Coordinator"
-#~ msgstr "Koordinator Utama"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Menindaklanjuti&nbsp;Proposal"
-#~ msgid "Debian Involvement"
-#~ msgstr "Partisipasi Debian"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Mengubah&nbsp;Proposal"
-#~ msgid "More Info"
-#~ msgstr "Informasi lebih lanjut"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Mengajukan&nbsp;Proposal"
-#~ msgid "Where"
-#~ msgstr "Tempat"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Bagaimana"
-#~ msgid "When"
-#~ msgstr "Waktu"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Halaman&nbsp;Utama&nbsp;Pemungutan&nbsp;Suara"
-#~ msgid "link may no longer be valid"
-#~ msgstr "link ini mungkin sudah kadaluwarsa"
+#~ msgid "Other"
+#~ msgstr "Lain-lain"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Acara mendatang"
+#~ msgid "Decided"
+#~ msgstr "Telah&nbsp;Diputuskan"
-#~ msgid "More information"
-#~ msgstr "Informasi lebih lanjut"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Pemungutan&nbsp;Suara&nbsp;Berjalan"
-#~ msgid "More information:"
-#~ msgstr "Informasi lainnya:"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Sedang&nbsp;Didiskusikan"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Sponsor situs web"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Menunggu&nbsp;Sponsor"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Sedang&nbsp;Didiskusikan"
+
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "telah diajukan"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donasi"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Daftar Penasehat"
+
+#~ msgid "Select a server near you"
+#~ msgstr "Pilih server terdekat"
diff --git a/italian/po/blends.it.po b/italian/po/blends.it.po
index 64b8c15bf29..b00934651af 100644
--- a/italian/po/blends.it.po
+++ b/italian/po/blends.it.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/italian/po/bugs.it.po b/italian/po/bugs.it.po
index c10735c1165..d2fae48c8a6 100644
--- a/italian/po/bugs.it.po
+++ b/italian/po/bugs.it.po
@@ -160,152 +160,152 @@ msgstr "Archiviati"
msgid "Archived and Unarchived"
msgstr "Archiviati o meno"
-#~ msgid "Flags:"
-#~ msgstr "Opzioni:"
-
-#~ msgid "active bugs"
-#~ msgstr "bug non risolti"
+#~ msgid "Exclude tag:"
+#~ msgstr "Tag escluso:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "mostra i bug unificati solo una volta"
+#~ msgid "Include tag:"
+#~ msgstr "Tag incluso:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "senza ordine per stato o gravità"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "non mostrare l'indice dei contenuti nell'intestazione"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "non mostrare le statistiche nel pié di pagina"
+#~ msgid "wontfix"
+#~ msgstr "wontfix"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible"
-#~ msgid "Package version:"
-#~ msgstr "Versione del pacchetto:"
+#~ msgid "security"
+#~ msgstr "security"
-#~ msgid "Distribution:"
-#~ msgstr "Distribuzione:"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "bugs"
-#~ msgstr "bug"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
-#~ msgid "open"
-#~ msgstr "open"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "forwarded"
-#~ msgstr "forwarded"
+#~ msgid "help"
+#~ msgstr "help"
-#~ msgid "pending"
-#~ msgstr "pending"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
-#~ msgid "fixed"
-#~ msgstr "fixed"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental"
-#~ msgid "done"
-#~ msgstr "done"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "Stato incluso:"
+#~ msgid "confirmed"
+#~ msgstr "confirmed"
-#~ msgid "Exclude status:"
-#~ msgstr "Stato escluso:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "critical"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "grave"
-#~ msgstr "grave"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "serious"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "important"
-#~ msgstr "important"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "minor"
-#~ msgstr "minor"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "wishlist"
-#~ msgstr "wishlist"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Includi gravità:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Escludi gravità:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Includi gravità:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "wishlist"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "minor"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "important"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "serious"
+#~ msgstr "serious"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "grave"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "critical"
+#~ msgstr "critical"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Stato escluso:"
-#~ msgid "confirmed"
-#~ msgstr "confirmed"
+#~ msgid "Include status:"
+#~ msgstr "Stato incluso:"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "done"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental"
+#~ msgid "fixed"
+#~ msgstr "fixed"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "pending"
+#~ msgstr "pending"
-#~ msgid "help"
-#~ msgstr "help"
+#~ msgid "forwarded"
+#~ msgstr "forwarded"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "open"
+#~ msgstr "open"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "bugs"
+#~ msgstr "bug"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "Distribution:"
+#~ msgstr "Distribuzione:"
-#~ msgid "security"
-#~ msgstr "security"
+#~ msgid "Package version:"
+#~ msgstr "Versione del pacchetto:"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "wontfix"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "non mostrare le statistiche nel pié di pagina"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "non mostrare l'indice dei contenuti nell'intestazione"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "senza ordine per stato o gravità"
-#~ msgid "Include tag:"
-#~ msgstr "Tag incluso:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "mostra i bug unificati solo una volta"
-#~ msgid "Exclude tag:"
-#~ msgstr "Tag escluso:"
+#~ msgid "active bugs"
+#~ msgstr "bug non risolti"
+
+#~ msgid "Flags:"
+#~ msgstr "Opzioni:"
diff --git a/italian/po/countries.it.po b/italian/po/countries.it.po
index ff9e366216e..1b79b469135 100644
--- a/italian/po/countries.it.po
+++ b/italian/po/countries.it.po
@@ -2,7 +2,7 @@
# Copyright (C) 2002 Giuseppe Sacco.
# Giuseppe Sacco <eppesuig@debian.org>, 2003.
# Luca Monducci <luca.mo@tiscali.it>, 2006-2017.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: countries\n"
diff --git a/italian/po/distrib.it.po b/italian/po/distrib.it.po
index 27f88730375..a72b1fdb281 100644
--- a/italian/po/distrib.it.po
+++ b/italian/po/distrib.it.po
@@ -206,23 +206,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/italian/po/doc.it.po b/italian/po/doc.it.po
index 8c491601444..20b5b6e9845 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 - 2017.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: doc.it\n"
@@ -14,7 +14,78 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:123
+#: ../../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 ""
+"\n"
+" Debian 8 è il manuale da avere per imparare Linux. Inizia al livello\n"
+" per principianti e insegna come ottere un sistema con interfaccia\n"
+" grafica e terminale.\n"
+" Questo libro fornisce le conoscenze di base per crescere e diventare un\n"
+" amministratore di sistema junior. Inizia con l'esplorazione\n"
+" dell'interfaccia desktop GNOME e con la sua messa a punto a seconda delle\n"
+" esigenze personali. Fa superare la paura di usare il terminale Linux e\n"
+" insegna i comandi essenziali per l'amministrazione di Debian. Amplia la\n"
+" conoscenza dei servizi di sistema (systemd) e insegna a modificarli.\n"
+" Ottieni di più dal software dentro e fuori Debian. Gestisci la rete\n"
+" di casa con network-manager, etc. Il 10 percento dei proventi di questo\n"
+" libro sono donati al Progetto Debian."
+
+#: ../../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 ""
+"Scritto da due sviluppatori Debian, questo libro gratuito è iniziato\n"
+"come la traduzione del loro best-seller francese <q>Cahier de l'admin\n"
+"Debian</q> (pubblicato da Eyrolles). Accessibile a tutti, questo libro\n"
+"insegna le cose essenziali a coloro che vogliono diventare degli\n"
+"amministratori di sistema Debian GNU/Linux efficacie e indipendenti.\n"
+"Copre tutti gli argomenti che un amministratore Linux competente deve\n"
+"padroneggiare, dall'installazione e l'aggiornamento del sistema, fino\n"
+"alla creazione dei pacchetti e la compilazione del kernel, ma anche il\n"
+"monitoraggio, il backup e la migrazione, senza scordarsi degli argomenti\n"
+"più avanzati come la configurazione di servizi sicuri con SELinux,\n"
+"installazioni automatiche o la virtualizzazione con Xen, KVM o LXC."
+
+#: ../../english/doc/books.data: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 ""
+"Lo scopo di questo libro, liberamente disponibile, è incrementare la\n"
+" velocità d'apprendimento di Debian (delle distribuzioni stable e unstable\n"
+" attuali). Comprende anche una guida di base per gli utenti che fanno\n"
+" l'installazione e l'amministrazione del sistema da soli (a casa propria,\n"
+" in ufficio o in una scuola)."
+
+#: ../../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"
@@ -38,7 +109,7 @@ msgstr ""
" Debian e gli amministratori che vogliono creare una rete sicura usando\n"
" Debian."
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -50,12 +121,13 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
"Il libro copre argomenti che vanno dai concetti di gestione dei pacchetti\n"
-"fino agli strumenti disponibili e su come possono essere usati per risolvere\n"
+"fino agli strumenti disponibili e su come possono essere usati per "
+"risolvere\n"
"problemi che potrebbero realmente verificarsi. Il libro è scritto in\n"
"tedesco, è prevista la traduzione in inglese. Formati: e-book (Online,\n"
"HTML, PDF, ePub, Mobi); è prevista una versione stampata.\n"
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -64,118 +136,25 @@ msgid ""
msgstr ""
"Questo libro insegna come installare e configurare il sistema e anche come "
"usare Debian in un contesto professionale. Mostra tutte le potenzialità "
-"della distribuzione (nell'attuale versione 8) e fornisce un manuale "
-"pratico per tutti gli utenti che vogliono imparare di più su Debian e sui "
-"servizi offerti."
-
-#: ../../english/doc/books.data:185 ../../english/doc/books.data:211
-#: ../../english/doc/books.data:59
-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 ""
-"Scritto da due sviluppatori Debian, questo libro gratuito è iniziato\n"
-"come la traduzione del loro best-seller francese <q>Cahier de l'admin\n"
-"Debian</q> (pubblicato da Eyrolles). Accessibile a tutti, questo libro\n"
-"insegna le cose essenziali a coloro che vogliono diventare degli\n"
-"amministratori di sistema Debian GNU/Linux efficacie e indipendenti.\n"
-"Copre tutti gli argomenti che un amministratore Linux competente deve\n"
-"padroneggiare, dall'installazione e l'aggiornamento del sistema, fino\n"
-"alla creazione dei pacchetti e la compilazione del kernel, ma anche il\n"
-"monitoraggio, il backup e la migrazione, senza scordarsi degli argomenti\n"
-"più avanzati come la configurazione di servizi sicuri con SELinux,\n"
-"installazioni automatiche o la virtualizzazione con Xen, KVM o LXC."
+"della distribuzione (nell'attuale versione 8) e fornisce un manuale pratico "
+"per tutti gli utenti che vogliono imparare di più su Debian e sui servizi "
+"offerti."
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.data:191
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."
+"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 ""
-"\n"
-" Debian 8 è il manuale da avere per imparare Linux. Inizia al livello\n"
-" per principianti e insegna come ottere un sistema con interfaccia\n"
-" grafica e terminale.\n"
-" Questo libro fornisce le conoscenze di base per crescere e diventare un\n"
-" amministratore di sistema junior. Inizia con l'esplorazione\n"
-" dell'interfaccia desktop GNOME e con la sua messa a punto a seconda delle\n"
-" esigenze personali. Fa superare la paura di usare il terminale Linux e\n"
-" insegna i comandi essenziali per l'amministrazione di Debian. Amplia la\n"
-" conoscenza dei servizi di sistema (systemd) e insegna a modificarli.\n"
-" Ottieni di più dal software dentro e fuori Debian. Gestisci la rete\n"
-" di casa con network-manager, etc. Il 10 percento dei proventi di questo\n"
-" libro sono donati al Progetto Debian."
-
-#: ../../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 ""
-"Lo scopo di questo libro, liberamente disponibile, è incrementare la\n"
-" velocità d'apprendimento di Debian (delle distribuzioni stable e unstable\n"
-" attuali). Comprende anche una guida di base per gli utenti che fanno\n"
-" l'installazione e l'amministrazione del sistema da soli (a casa propria,\n"
-" in ufficio o in una scuola)."
-
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 per architettura ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-"Questo libro è per sviluppatori che lavorano con GNU/Linux su processori\n"
-" ARM. Copre una configurazione veloce per alcuni device specifici (LART,\n"
-" Assabet, Psion5.) Inoltre fornisce informazioni generali, strumenti e\n"
-" tecniche. La catena di sviluppo GNU è mostrata sia in nativo che in "
-"modalità\n"
-" cross compiler, come bootloader, patch del kernel, dischi RAM, peculiarità "
-"di\n"
-" ARM e altre risorse ARM. Inoltre include un tutorial completo sugli\n"
-" strumenti di svilppo GNU di altre piattaforme.\n"
-" Non è specifico per Debian, ma la distribuzione Aleph ARMLinux è "
-"fortemente\n"
-" basata su Debian-ARM ed è assunto che il lettore stia lavorando con "
-"questa\n"
-" distribuzione e abbia anche un'altra macchina Debian."
#: ../../english/doc/books.def:38
msgid "Author:"
@@ -197,6 +176,30 @@ msgstr "CD incluso/i:"
msgid "Publisher:"
msgstr "Editore:"
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Autori:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Editori:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Manutentore:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Stato:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Disponibilità:"
+
+#: ../../english/doc/manuals.defs:92
+msgid "Latest version:"
+msgstr "Ultima versione:"
+
#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(versione <get-var version />)"
@@ -205,13 +208,13 @@ msgstr "(versione <get-var version />)"
msgid "plain text"
msgstr "solo testo"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a>."
+"\"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
@@ -239,14 +242,6 @@ msgstr ""
"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
"\"https://packages.debian.org/subversion\">Subversion</a>."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
-"\"https://packages.debian.org/git\">Git</a>."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -269,30 +264,6 @@ msgstr "Pacchetto Debian"
msgid "Debian package (archived)"
msgstr "Pacchetto Debian (archiviato)"
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Autori:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Editori:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Manutentore:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Stato:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Disponibilità:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Ultima versione:"
-
#: ../../english/releases/arches.data:35
msgid "HTML"
msgstr "HTML"
@@ -302,184 +273,125 @@ msgid "PDF"
msgstr "PDF"
#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
#~ msgstr ""
-#~ "Usare <a href=\"cvs\">SVN</a> per scaricare il testo sorgente SGML di "
-#~ "<get-var ddp_pkg_loc />."
+#~ "Debian GNU/Linux 3.1r0 i386, con personalizzazione da parte dell'autore "
+#~ "(DVD + CD)"
-#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
-#~ msgstr ""
-#~ "Questo è il libro giusto per chi vuole imparare a creare piattaforme IT "
-#~ "semplici o complesse utilizzando solo Software Libero. All'interno "
-#~ "contiene moltissime procedure verificate e adattate alle best practice "
-#~ "per la realizzazione di infrastrutture tecnologice. Una guida facile da "
-#~ "leggere e completa che accompagna il lettore fino a ottenere specifici "
-#~ "obiettivi con il sistema operativo Debian GNU/Linux."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD di sarge, con installatore e una selezione di pacchetti"
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Questo libro è diviso in quattro parti: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system e Advanced operations. Ogni "
-#~ "capitolo\n"
-#~ " spiega in dettaglio le caratteristiche del sistema operativo. I primi\n"
-#~ " capitoli aiutano il lettore a capire come il sistema utilizza le "
-#~ "risorse\n"
-#~ " di base come processore e memoria. Una dettagliata analisi dei file\n"
-#~ " system quali Ext2, Ext3 e ReiserFS permette all'utente di fare la "
-#~ "giusta\n"
-#~ " scelta in base alle proprie necessità. Molte figure in tutto il libro\n"
-#~ " mostrano vari aspetti delle performance. Questo libro è pensato\n"
-#~ " per studenti di college e per chiunque voglia conoscere GNU/Linux in\n"
-#~ " profondità. Questo libro discute di Debian Sarge."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "CD live, con Knoppix"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Il primo libro in persiano su Debian GNU/Linux. Questo libro aiuta\n"
-#~ " nell'installazione di Debian GNU/Linux e nella configurazione dei "
-#~ "servizi\n"
-#~ " di rete come web, database, firewall, posta, ftp, ecc. Copre anche "
-#~ "l'uso\n"
-#~ " del sistema di gestione dei pacchetti di Debian."
+#~ "Utenti inesperti e avanzati troveranno questo libro una fonte\n"
+#~ " inesauribile di informazioni sull'uso di Debian come strumento\n"
+#~ " personale, server di intranet e internet o per lo sviluppo.\n"
+#~ " Contiene anche informazioni di base sul progetto e una spiegazione\n"
+#~ " dettagliata del sistema di gestione dei pacchetti Debian."
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "DVD ufficiale di Debian GNU/Linux 3.1r0a sarge (i386)"
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Questo libro introduce i lettori a Debian GNU/Linux con molti tutorial e\n"
-#~ " suggerimenti.\n"
-#~ " Scritto in coreano, questo libro copre in maniera completa gli aspetti "
+#~ "Questo libro introduce i concetti e le tecniche del sistema operativo "
+#~ "Debian,\n"
+#~ " spiegando il loro uso e le loro insidie, e illustrando i concetti che "
+#~ "sono\n"
+#~ " dietro a ciascun approccio. Lo scopo non è quello di essere un manuale "
#~ "di\n"
-#~ " un sistema Debian GNU/Linux: prima configurazione, installazione di "
-#~ "pacchetti,\n"
-#~ " configurazione di X, connessione a Internet, gestione della rete, e "
-#~ "altro.\n"
-#~ " Questo libro fornisce una serie di suggerimenti su come configurare un\n"
-#~ " ambiente in lingua coreana ed è molto buono anche per neofiti."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "I tre CD ufficiali di potato r3 e un CD non ufficiale di woody"
+#~ " riferimento ma di far capire al lettore il funzionamento del progetto e "
+#~ "del\n"
+#~ " sistema operativo per imparare e comprendere le sofisticate ed "
+#~ "eleganti,\n"
+#~ " apparentemente un po' poco intuitive, soluzioni che hanno evoluto il "
+#~ "sistema\n"
+#~ " Debian negli ultimi dieci anni. Il libro può essere usato dagli "
+#~ "amministratori\n"
+#~ " UNIX/Linux esperti come una eccellente risorsa da affiancare a un "
+#~ "normale\n"
+#~ " manuale di riferimento per Linux per prendere confidenza con la "
+#~ "filosofia\n"
+#~ " Debian."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Questo libro fornisce una breve guida all'installazione di Debian\n"
-#~ " GNU/Linux, comandi fondamentali di Unix e Linux, configurazione di\n"
-#~ " base e gestione del sistema e della rete, configurazione del\n"
-#~ " sistema X Window e l'utilizzo del multimedia in Debian GNU/Linux\n"
-#~ " Il libro contiene anche una guida per manutentori, che dovrebbe\n"
-#~ " stimolare coreani a diventare manutentori Debian ufficiali."
-
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 Woody non ufficiale, 3 Potato rev0"
+#~ "Una guida di riferimento per il sistema Debian GNU/Linux che mostra,\n"
+#~ " <q>ricette</q>, come utilizzarlo per le attività di tutti i\n"
+#~ " giorni &mdash; dal lavorare con testi, immagini, suoni ai programmi di\n"
+#~ " produttività agli aspetti legati alla rete. Come il software che\n"
+#~ " descrive, il libro è copyleft e il suo sorgente è disponibile."
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Questo libro tratta di argomenti generali riguardanti Debian GNU/Linux:\n"
-#~ " installazione, APT e dpkg, shell, X Window System, reti, "
-#~ "amministrazione\n"
-#~ " di sistema, configurazione del kernel, condivisione con Windows, messa\n"
-#~ " a punto di server e così via.\n"
-#~ " Grazie ai CD personalizzati si sarà in grado di installare e inziare "
-#~ "ad\n"
-#~ " usare Debian GNU/Linux con localizzazione giapponese."
+#~ "<q>Learning Debian GNU/Linux</q> guida l'utente inesperto attraverso i "
+#~ "passi\n"
+#~ " dell'installazione e configurazione di Debian GNU/Linux. Gli\n"
+#~ " utenti Windows potranno leggervi una introduzione a questo mondo "
+#~ "informatico\n"
+#~ " scritta da Bill McCarty in <q>Learning Debian GNU/Linux</q>."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 edizione dell'autore (3 CD)"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Questo è l'ultimo libro per Sarge della serie che in Giappone è ritenuta "
-#~ "la\n"
-#~ " bibbia per Debian. Il libro copre ogni aspetto dell'uso di Debian GNU/"
-#~ "Linux\n"
-#~ " 3.1 Sarge, come l'installazione, gli ambienti desktop, "
-#~ "l'amministrazione del\n"
-#~ " sistema e la configurazione di server. Inoltre, questo libro include "
-#~ "anche\n"
-#~ " delle sorgenti di pacchetti commerciali per decorare il proprio "
-#~ "desktop.\n"
-#~ " Il libro può essere utile a tutti gli utenti Debian, dai principianti "
-#~ "agli\n"
-#~ " esperti."
+#~ "Include oltre 230 pagine e tre CD-ROM. Gli argomenti coperti sono\n"
+#~ " Debian Linux, rete, strumenti di programmazione, GUI, desktop\n"
+#~ " publishing, affari, cose buffe e multimedia.\n"
+#~ " Sono compresi 30 giorni di supporto via email."
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ " Una <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=242485044\">\n"
-#~ " pubblicazione alternativa</a> è disponibile da Lehmanns\n"
-#~ " Fachbuchhandlung a 29,95€ (prezzo di settembre 2008)."
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
+
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 edizioni: una senza DVD, l'altra con due DVD (i386)"
+
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) su DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Questo libro ha lo stile di un dizionario e fornisce molti suggerimenti\n"
-#~ " per i principianti e gli utenti con abilità intermedie; "
-#~ "l'installazione\n"
-#~ " usando vari metodi, la personalizzazione del desktop, la risoluzione "
-#~ "dei\n"
-#~ " problemi, parecchie nozioni utili e così via."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge (su CD)"
+#~ "2 edizioni: Una senza CD, l'altra con i CD ufficiali (i386, contrib e "
+#~ "sorgenti)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -515,123 +427,227 @@ msgstr "PDF"
#~ "un\n"
#~ " router di ingresso o un server per stazioni Windows (Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge (su CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "2 edizioni: Una senza CD, l'altra con i CD ufficiali (i386, contrib e "
-#~ "sorgenti)"
+#~ "Questo libro ha lo stile di un dizionario e fornisce molti suggerimenti\n"
+#~ " per i principianti e gli utenti con abilità intermedie; "
+#~ "l'installazione\n"
+#~ " usando vari metodi, la personalizzazione del desktop, la risoluzione "
+#~ "dei\n"
+#~ " problemi, parecchie nozioni utili e così via."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) su DVD"
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ " Una <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=242485044\">\n"
+#~ " pubblicazione alternativa</a> è disponibile da Lehmanns\n"
+#~ " Fachbuchhandlung a 29,95€ (prezzo di settembre 2008)."
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 edizioni: una senza DVD, l'altra con due DVD (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Questo è l'ultimo libro per Sarge della serie che in Giappone è ritenuta "
+#~ "la\n"
+#~ " bibbia per Debian. Il libro copre ogni aspetto dell'uso di Debian GNU/"
+#~ "Linux\n"
+#~ " 3.1 Sarge, come l'installazione, gli ambienti desktop, "
+#~ "l'amministrazione del\n"
+#~ " sistema e la configurazione di server. Inoltre, questo libro include "
+#~ "anche\n"
+#~ " delle sorgenti di pacchetti commerciali per decorare il proprio "
+#~ "desktop.\n"
+#~ " Il libro può essere utile a tutti gli utenti Debian, dai principianti "
+#~ "agli\n"
+#~ " esperti."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edizione dell'autore (3 CD)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Include oltre 230 pagine e tre CD-ROM. Gli argomenti coperti sono\n"
-#~ " Debian Linux, rete, strumenti di programmazione, GUI, desktop\n"
-#~ " publishing, affari, cose buffe e multimedia.\n"
-#~ " Sono compresi 30 giorni di supporto via email."
+#~ "Questo libro tratta di argomenti generali riguardanti Debian GNU/Linux:\n"
+#~ " installazione, APT e dpkg, shell, X Window System, reti, "
+#~ "amministrazione\n"
+#~ " di sistema, configurazione del kernel, condivisione con Windows, messa\n"
+#~ " a punto di server e così via.\n"
+#~ " Grazie ai CD personalizzati si sarà in grado di installare e inziare "
+#~ "ad\n"
+#~ " usare Debian GNU/Linux con localizzazione giapponese."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 Woody non ufficiale, 3 Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "<q>Learning Debian GNU/Linux</q> guida l'utente inesperto attraverso i "
-#~ "passi\n"
-#~ " dell'installazione e configurazione di Debian GNU/Linux. Gli\n"
-#~ " utenti Windows potranno leggervi una introduzione a questo mondo "
-#~ "informatico\n"
-#~ " scritta da Bill McCarty in <q>Learning Debian GNU/Linux</q>."
+#~ "Questo libro fornisce una breve guida all'installazione di Debian\n"
+#~ " GNU/Linux, comandi fondamentali di Unix e Linux, configurazione di\n"
+#~ " base e gestione del sistema e della rete, configurazione del\n"
+#~ " sistema X Window e l'utilizzo del multimedia in Debian GNU/Linux\n"
+#~ " Il libro contiene anche una guida per manutentori, che dovrebbe\n"
+#~ " stimolare coreani a diventare manutentori Debian ufficiali."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "I tre CD ufficiali di potato r3 e un CD non ufficiale di woody"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Una guida di riferimento per il sistema Debian GNU/Linux che mostra,\n"
-#~ " <q>ricette</q>, come utilizzarlo per le attività di tutti i\n"
-#~ " giorni &mdash; dal lavorare con testi, immagini, suoni ai programmi di\n"
-#~ " produttività agli aspetti legati alla rete. Come il software che\n"
-#~ " descrive, il libro è copyleft e il suo sorgente è disponibile."
+#~ "Questo libro introduce i lettori a Debian GNU/Linux con molti tutorial e\n"
+#~ " suggerimenti.\n"
+#~ " Scritto in coreano, questo libro copre in maniera completa gli aspetti "
+#~ "di\n"
+#~ " un sistema Debian GNU/Linux: prima configurazione, installazione di "
+#~ "pacchetti,\n"
+#~ " configurazione di X, connessione a Internet, gestione della rete, e "
+#~ "altro.\n"
+#~ " Questo libro fornisce una serie di suggerimenti su come configurare un\n"
+#~ " ambiente in lingua coreana ed è molto buono anche per neofiti."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Questo libro introduce i concetti e le tecniche del sistema operativo "
-#~ "Debian,\n"
-#~ " spiegando il loro uso e le loro insidie, e illustrando i concetti che "
-#~ "sono\n"
-#~ " dietro a ciascun approccio. Lo scopo non è quello di essere un manuale "
-#~ "di\n"
-#~ " riferimento ma di far capire al lettore il funzionamento del progetto e "
-#~ "del\n"
-#~ " sistema operativo per imparare e comprendere le sofisticate ed "
-#~ "eleganti,\n"
-#~ " apparentemente un po' poco intuitive, soluzioni che hanno evoluto il "
-#~ "sistema\n"
-#~ " Debian negli ultimi dieci anni. Il libro può essere usato dagli "
-#~ "amministratori\n"
-#~ " UNIX/Linux esperti come una eccellente risorsa da affiancare a un "
-#~ "normale\n"
-#~ " manuale di riferimento per Linux per prendere confidenza con la "
-#~ "filosofia\n"
-#~ " Debian."
+#~ "Il primo libro in persiano su Debian GNU/Linux. Questo libro aiuta\n"
+#~ " nell'installazione di Debian GNU/Linux e nella configurazione dei "
+#~ "servizi\n"
+#~ " di rete come web, database, firewall, posta, ftp, ecc. Copre anche "
+#~ "l'uso\n"
+#~ " del sistema di gestione dei pacchetti di Debian."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "DVD ufficiale di Debian GNU/Linux 3.1r0a sarge (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Questo libro è diviso in quattro parti: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system e Advanced operations. Ogni "
+#~ "capitolo\n"
+#~ " spiega in dettaglio le caratteristiche del sistema operativo. I primi\n"
+#~ " capitoli aiutano il lettore a capire come il sistema utilizza le "
+#~ "risorse\n"
+#~ " di base come processore e memoria. Una dettagliata analisi dei file\n"
+#~ " system quali Ext2, Ext3 e ReiserFS permette all'utente di fare la "
+#~ "giusta\n"
+#~ " scelta in base alle proprie necessità. Molte figure in tutto il libro\n"
+#~ " mostrano vari aspetti delle performance. Questo libro è pensato\n"
+#~ " per studenti di college e per chiunque voglia conoscere GNU/Linux in\n"
+#~ " profondità. Questo libro discute di Debian Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Utenti inesperti e avanzati troveranno questo libro una fonte\n"
-#~ " inesauribile di informazioni sull'uso di Debian come strumento\n"
-#~ " personale, server di intranet e internet o per lo sviluppo.\n"
-#~ " Contiene anche informazioni di base sul progetto e una spiegazione\n"
-#~ " dettagliata del sistema di gestione dei pacchetti Debian."
+#~ "Questo è il libro giusto per chi vuole imparare a creare piattaforme IT "
+#~ "semplici o complesse utilizzando solo Software Libero. All'interno "
+#~ "contiene moltissime procedure verificate e adattate alle best practice "
+#~ "per la realizzazione di infrastrutture tecnologice. Una guida facile da "
+#~ "leggere e completa che accompagna il lettore fino a ottenere specifici "
+#~ "obiettivi con il sistema operativo Debian GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "CD live, con Knoppix"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Usare <a href=\"cvs\">SVN</a> per scaricare il testo sorgente SGML di "
+#~ "<get-var ddp_pkg_loc />."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD di sarge, con installatore e una selezione di pacchetti"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a>."
#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
#~ msgstr ""
-#~ "Debian GNU/Linux 3.1r0 i386, con personalizzazione da parte dell'autore "
-#~ "(DVD + CD)"
+#~ "Questo libro è per sviluppatori che lavorano con GNU/Linux su processori\n"
+#~ " ARM. Copre una configurazione veloce per alcuni device specifici "
+#~ "(LART,\n"
+#~ " Assabet, Psion5.) Inoltre fornisce informazioni generali, strumenti e\n"
+#~ " tecniche. La catena di sviluppo GNU è mostrata sia in nativo che in "
+#~ "modalità\n"
+#~ " cross compiler, come bootloader, patch del kernel, dischi RAM, "
+#~ "peculiarità di\n"
+#~ " ARM e altre risorse ARM. Inoltre include un tutorial completo sugli\n"
+#~ " strumenti di svilppo GNU di altre piattaforme.\n"
+#~ " Non è specifico per Debian, ma la distribuzione Aleph ARMLinux è "
+#~ "fortemente\n"
+#~ " basata su Debian-ARM ed è assunto che il lettore stia lavorando con "
+#~ "questa\n"
+#~ " distribuzione e abbia anche un'altra macchina Debian."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 per architettura ARM"
diff --git a/italian/po/l10n.it.po b/italian/po/l10n.it.po
index f9ecffadbc0..33a61794ac8 100644
--- a/italian/po/l10n.it.po
+++ b/italian/po/l10n.it.po
@@ -98,8 +98,8 @@ msgstr "File POT"
msgid "Hints for translators"
msgstr "Suggerimenti per i traduttori"
-#~ msgid "Original templates"
-#~ msgstr "Modelli originali"
-
#~ msgid "Translated templates"
#~ msgstr "Modelli tradotti"
+
+#~ msgid "Original templates"
+#~ msgstr "Modelli originali"
diff --git a/italian/po/organization.it.po b/italian/po/organization.it.po
index a4297fc5744..83fe5ac9c56 100644
--- a/italian/po/organization.it.po
+++ b/italian/po/organization.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2003.
# Giuseppe Sacco <eppesuig@debian.org>, 2004, 2005.
# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2017.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: organization.it\n"
@@ -48,13 +48,13 @@ msgid "manager"
msgstr "manager"
#: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
-msgstr "Gestore del rilascio stabile"
-
-#: ../../english/intro/organization.data:34
msgid "SRM"
msgstr "SRM"
+#: ../../english/intro/organization.data:34
+msgid "Stable Release Manager"
+msgstr "Gestore del rilascio stabile"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "mago"
@@ -77,22 +77,22 @@ msgid "Officers"
msgstr "Direttori"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribuzione"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr "Comunicazione e sociale"
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Team Pubblicità"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Supporto e infrastruttura"
@@ -109,181 +109,181 @@ msgstr "Leader"
msgid "Technical Committee"
msgstr "Commissione tecnica"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Segretario"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Progetti di sviluppo"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Archivi FTP"
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Assistenti FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Maghi FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backport"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Team Backport"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Pacchetti individuali"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Gestione del rilascio"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Team di rilascio"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Controllo qualità"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Team per il sistema d'installazione"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Note di rilascio"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Immagini dei CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produzione"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infrastruttura di compilazione automatica"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Team wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Amministrazione di buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Documentazione"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr ""
"Elenco dei pacchetti richiesti e di quelli che necessitano di manodopera "
"(WNPP)"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr "Team Debian Live"
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Port"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Configurazioni speciali"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Portatili"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Firewall"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Sistemi embedded"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Contatto per la stampa"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Pagine web"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Coninvolgimento in progetti esterni"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Progetto Debian Women"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Anti-molestie"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Eventi"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "Commissione DebConf"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Programma per i partner"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Coordinazione delle donazioni hardware"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Supporto agli utenti"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Sistema di tracciamento dei bug (BTS)"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Amministrazione e archivi delle liste di messaggi"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Accoglienza dei nuovi membri"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Gestori degli account Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -291,31 +291,31 @@ msgstr ""
"Per inviare un messaggio privato a tutti i Gestori degli account Debian, "
"usare la chiave GPG 57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Gestori del Keyring (PGP e GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Team della sicurezza"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Pagina dei consulenti"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Pagina dei rivenditori di CD"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Regolamento"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Amministrazione del sistema"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -324,7 +324,7 @@ msgstr ""
"delle macchine Debian, ivi inclusi i problemi relativi a password o a "
"pacchetti non installati."
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -334,146 +334,152 @@ msgstr ""
"<a href=\"https://db.debian.org/machines.cgi\">macchine Debian</a>, dovrebbe "
"contenere informazioni sugli amministratori divisi per macchine."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Amministratore dell'elenco LDAP degli sviluppatori"
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Mirror"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Gestori del DNS"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Sistema di tracciamento dei pacchetti"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:444
msgid "Treasurer"
msgstr "Tesoriere"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:450
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:448
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Amministratori di Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Amministratori di Alioth"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian per bambini da 1 a 99 anni"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian per la pratica e la ricerca medica"
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian nell'educazione"
-#: ../../english/intro/organization.data:472
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian negli uffici legali"
-#: ../../english/intro/organization.data:476
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian per disabili"
-#: ../../english/intro/organization.data:480
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian per la scienza e la ricerca scientifica"
-#: ../../english/intro/organization.data:483
+#: ../../english/intro/organization.data:492
msgid "Debian for astronomy"
msgstr "Debian per l'astronomia"
-#~ msgid "Auditor"
-#~ msgstr "Auditor"
-
-#~ msgid "Marketing Team"
-#~ msgstr "Team Marketing"
+#~ msgid "Handhelds"
+#~ msgstr "Palmari"
-#~ msgid "APT Team"
-#~ msgstr "Team APT"
+#~ msgid "Publicity"
+#~ msgstr "Pubblicità"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Il nome di ogni amministratore responsabile dei buildd può essere "
-#~ "trovato su <a href=\"http://www.buildd.net\">http://www.buildd.net</a>. "
-#~ "Scegliere una architetura e una distribuzione per conoscere i buildd "
-#~ "disponibili e i relativi amministratori."
+#~ msgid "current Debian Project Leader"
+#~ msgstr "l'attuale Leader del Progetto Debian"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Gli amministratori responsabili dei buildd per una specifica architettura "
-#~ "possono essere contattati all'indirizzo <genericemail arch@buildd.debian."
-#~ "org>, per esempio <genericemail i386@buildd.debian.org>."
+#~ msgid "Testing Security Team"
+#~ msgstr "Team della sicurezza per testing"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian per le organizzazioni non-profit"
+#~ msgid "Live System Team"
+#~ msgstr "Team per il sistema live"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Il sistema operativo universale come Desktop"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Manutentore del portachiavi Debian"
-#~ msgid "Accountant"
-#~ msgstr "Ragioniere"
+#~ msgid "DebConf chairs"
+#~ msgstr "Consiglio d'amministrazione della DebConf"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Team di rilascio per &ldquo;stable&rdquo;"
+#~ msgid "Bits from Debian"
+#~ msgstr "Notizie in pillole da Debian"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Custom Debian Distribution"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Amministratori Summer of Code 2013"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordinazione della firma delle chiavi"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Non attivo: non rilasciato con squeeze)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Progetto di verifica della sicurezza"
+#~ msgid "Volatile Team"
+#~ msgstr "Team Volatile"
#~ msgid "Vendors"
#~ msgstr "Rivenditori"
-#~ msgid "Volatile Team"
-#~ msgstr "Team Volatile"
+#~ msgid "Security Audit Project"
+#~ msgstr "Progetto di verifica della sicurezza"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Non attivo: non rilasciato con squeeze)"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordinazione della firma delle chiavi"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Amministratori Summer of Code 2013"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Custom Debian Distribution"
-#~ msgid "Bits from Debian"
-#~ msgstr "Notizie in pillole da Debian"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Team di rilascio per &ldquo;stable&rdquo;"
-#~ msgid "DebConf chairs"
-#~ msgstr "Consiglio d'amministrazione della DebConf"
+#~ msgid "Accountant"
+#~ msgstr "Ragioniere"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Manutentore del portachiavi Debian"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Il sistema operativo universale come Desktop"
-#~ msgid "Live System Team"
-#~ msgstr "Team per il sistema live"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian per le organizzazioni non-profit"
-#~ msgid "Testing Security Team"
-#~ msgstr "Team della sicurezza per testing"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Gli amministratori responsabili dei buildd per una specifica architettura "
+#~ "possono essere contattati all'indirizzo <genericemail arch@buildd.debian."
+#~ "org>, per esempio <genericemail i386@buildd.debian.org>."
-#~ msgid "current Debian Project Leader"
-#~ msgstr "l'attuale Leader del Progetto Debian"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Il nome di ogni amministratore responsabile dei buildd può essere "
+#~ "trovato su <a href=\"http://www.buildd.net\">http://www.buildd.net</a>. "
+#~ "Scegliere una architetura e una distribuzione per conoscere i buildd "
+#~ "disponibili e i relativi amministratori."
-#~ msgid "Publicity"
-#~ msgstr "Pubblicità"
+#~ msgid "APT Team"
+#~ msgstr "Team APT"
-#~ msgid "Handhelds"
-#~ msgstr "Palmari"
+#~ msgid "Marketing Team"
+#~ msgstr "Team Marketing"
+
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
diff --git a/italian/po/others.it.po b/italian/po/others.it.po
index a4179fea006..b47623b995b 100644
--- a/italian/po/others.it.po
+++ b/italian/po/others.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Giuseppe Sacco <eppesuig@debian.org>, 2004, 2005.
# Luca Monducci <luca.mo@tiscali.it>, 2007-2017.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: others.it\n"
@@ -15,14 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/banners/index.tags:11
-msgid "Old banner ads"
-msgstr "Banner precedenti"
-
#: ../../english/banners/index.tags:7
msgid "Download"
msgstr "Scarica"
+#: ../../english/banners/index.tags:11
+msgid "Old banner ads"
+msgstr "Banner precedenti"
+
#: ../../english/devel/debian-installer/ports-status.defs:10
msgid "Working"
msgstr "Funzionante"
@@ -63,6 +63,10 @@ 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"
@@ -95,10 +99,6 @@ msgstr "Passo 7"
msgid "Applicants' checklist"
msgstr "Checklist dei candidati"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Angolo dei Nuovi Membri"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -134,6 +134,14 @@ msgstr "Fax:"
msgid "Address"
msgstr "Indirizzo:"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Con&nbsp;la&nbsp;scritta&nbsp;&ldquo;Debian&rdquo;"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Senza&nbsp;la&nbsp;scritta&nbsp;&ldquo;Debian&rdquo;"
+
#: ../../english/logos/index.data:12
msgid "Encapsulated PostScript"
msgstr "Encapsulated PostScript"
@@ -154,22 +162,13 @@ msgstr "[Potenziato da Debian]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (pulsante piccolo)"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Con&nbsp;la&nbsp;scritta&nbsp;&ldquo;Debian&rdquo;"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Senza&nbsp;la&nbsp;scritta&nbsp;&ldquo;Debian&rdquo;"
-
#: ../../english/mirror/submit.inc:7
msgid "same as the above"
msgstr "come in precedenza"
-#: ../../english/misc/merchandise.def:102
-msgid "Money is used to organize local free software events"
-msgstr ""
-"I fondi sono usati per organizzare eventi legati al software libero"
+#: ../../english/misc/merchandise.def:8
+msgid "Products"
+msgstr "Prodotti"
#: ../../english/misc/merchandise.def:11
msgid "T-shirts"
@@ -247,14 +246,14 @@ msgstr "cordini"
msgid "others"
msgstr "altro"
-#: ../../english/misc/merchandise.def:8
-msgid "Products"
-msgstr "Prodotti"
-
#: ../../english/misc/merchandise.def:98
msgid "Donates money to Debian"
msgstr "Fare donazioni a Debian"
+#: ../../english/misc/merchandise.def:102
+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?"
@@ -286,6 +285,14 @@ msgstr "Fai parte di altri gruppi di donne legati alle tecnologie? Quali?"
msgid "A bit more about you..."
msgstr "Qualche informazione in più su di te..."
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
+msgstr "OK"
+
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
+msgstr "Errato"
+
#: ../../english/y2k/l10n.data:12
msgid "OK?"
msgstr "OK?"
@@ -322,25 +329,17 @@ msgstr "Versione"
msgid "URL"
msgstr "URL"
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
-msgstr "OK"
-
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
-msgstr "Errato"
-
-#~ msgid "Wanted:"
-#~ msgstr "Richiesto:"
+#~ msgid "Where:"
+#~ msgstr "Dove:"
-#~ msgid "Who:"
-#~ msgstr "Chi:"
+#~ msgid "Specifications:"
+#~ msgstr "Specifiche:"
#~ msgid "Architecture:"
#~ msgstr "Architettura:"
-#~ msgid "Specifications:"
-#~ msgstr "Specifiche:"
+#~ msgid "Who:"
+#~ msgstr "Chi:"
-#~ msgid "Where:"
-#~ msgstr "Dove:"
+#~ msgid "Wanted:"
+#~ msgstr "Richiesto:"
diff --git a/italian/po/partners.it.po b/italian/po/partners.it.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/italian/po/partners.it.po
+++ b/italian/po/partners.it.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/italian/po/stats.it.po b/italian/po/stats.it.po
index ce6cd67798d..1079a104017 100644
--- a/italian/po/stats.it.po
+++ b/italian/po/stats.it.po
@@ -1,7 +1,7 @@
# Debian Web Site. stats.it.po
# Francesca Ciceri <madamezou@yahoo.it>
# Luca Monducci <luca.mo@tiscali.it>
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: stats.it.po\n"
@@ -14,6 +14,10 @@ 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."
@@ -26,83 +30,90 @@ msgstr "Ci sono %d byte da tradurre."
msgid "There are %d strings to translate."
msgstr "Ci sono %d stringhe da tradurre."
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistiche di traduzione per il sito web Debian"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
+msgstr "Versione della traduzione errata"
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
+#: ../../stattrans.pl:284
msgid "This translation is too out of date"
msgstr "Questa traduzione è troppo datata"
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
-msgid "Wrong translation version"
-msgstr "Versione della traduzione errata"
-
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "L'originale è più recente di questa traduzione"
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "L'originale non esiste più"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "numero di visite non disponibile"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "visite"
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Fare clic per recuperare i dati diffstat"
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Diff unificato"
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Diff colorato"
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Diff colorato"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Creato con <transstatslink>"
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Riepilogo delle traduzioni per"
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Non tradotte"
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Da aggiornare"
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Tradotte"
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Aggiornate"
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "file"
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "byte"
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -110,139 +121,139 @@ msgstr ""
"Nota: le pagine sono elencate in base alla popolarità. Passare il puntatore "
"del mouse sul nome della pagina per visualizzare il numero di visite."
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Traduzioni da aggiornare"
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "File"
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Commento"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Traduzione"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Manutentore"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Stato"
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Traduttore"
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Pagine generiche non tradotte"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Pagine generiche non tradotte"
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Notizie non tradotte"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Notizie non tradotte"
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Pagine dei consulenti e degli utenti non tradotte"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Pagine dei consulenti e degli utenti non tradotte"
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Pagine internazionali non tradotte"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Pagine internazionali non tradotte"
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Pagine tradotte (aggiornate)"
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Modelli tradotti (file PO)"
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Statistiche di traduzione dei file PO"
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Fuzzy"
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Non tradotte"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Totale"
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Totale:"
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Pagine web tradotte"
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Statistiche di traduzione in base al numero delle pagine"
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Lingua"
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Traduzioni"
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Pagine web tradotte (per dimensione)"
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Statistiche di traduzione in base alla dimensione della pagina"
-#~ msgid "Created with"
-#~ msgstr "Creato con"
+#~ msgid "Hit data from %s, gathered %s."
+#~ msgstr "Numero di visite recuperato da %s il %s."
#~ msgid "Origin"
#~ msgstr "Originale"
-#~ msgid "Hit data from %s, gathered %s."
-#~ msgstr "Numero di visite recuperato da %s il %s."
+#~ msgid "Created with"
+#~ msgstr "Creato con"
diff --git a/italian/po/templates.it.po b/italian/po/templates.it.po
index 274e11547ef..9606d357ef6 100644
--- a/italian/po/templates.it.po
+++ b/italian/po/templates.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Giuseppe Sacco <eppesuig@debian.org>, 2004-2007.
# Luca Monducci <luca.mo@tiscali.it>, 2008-2017.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: templates.it\n"
@@ -32,6 +32,14 @@ msgstr "Debian"
msgid "Debian website search"
msgstr "Cerca nel sito web Debian"
+#: ../../english/template/debian/common_translation.wml:4
+msgid "Yes"
+msgstr "Sì"
+
+#: ../../english/template/debian/common_translation.wml:7
+msgid "No"
+msgstr "No"
+
#: ../../english/template/debian/common_translation.wml:10
msgid "Debian Project"
msgstr "Progetto Debian"
@@ -80,10 +88,6 @@ msgstr "Contatti"
msgid "Donations"
msgstr "Donazioni"
-#: ../../english/template/debian/common_translation.wml:4
-msgid "Yes"
-msgstr "Sì"
-
#: ../../english/template/debian/common_translation.wml:40
msgid "Events"
msgstr "Eventi"
@@ -125,10 +129,6 @@ msgstr "Cerca"
msgid "none"
msgstr "nessuno"
-#: ../../english/template/debian/common_translation.wml:7
-msgid "No"
-msgstr "No"
-
#: ../../english/template/debian/common_translation.wml:70
msgid "Go"
msgstr "Vai"
@@ -204,12 +204,19 @@ msgstr "nella versione 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Per segnalare un problema con il sito web inviare una e-mail <strong>in "
"inglese</strong> a <a href=\"mailto:debian-www@lists.debian.org\">debian-"
@@ -257,74 +264,22 @@ msgstr ""
"Come configurare <a href=m4_HOME/intro/cn>la lingua predefinita per i "
"documenti</a>"
+#: ../../english/template/debian/links.tags.wml:4
+msgid "Debian International"
+msgstr "Debian diventa Internazionale"
+
+#: ../../english/template/debian/links.tags.wml:7
+msgid "Partners"
+msgstr "Partner"
+
#: ../../english/template/debian/links.tags.wml:10
msgid "Debian Weekly News"
msgstr "Notizie settimanali Debian"
-#: ../../english/template/debian/links.tags.wml:101
-msgid "Free Software"
-msgstr "Software Libero"
-
-#: ../../english/template/debian/links.tags.wml:107
-msgid "Development"
-msgstr "Sviluppo"
-
-#: ../../english/template/debian/links.tags.wml:110
-msgid "Help Debian"
-msgstr "Aiutare Debian"
-
-#: ../../english/template/debian/links.tags.wml:113
-msgid "Bug reports"
-msgstr "Segnalazioni di bug"
-
-#: ../../english/template/debian/links.tags.wml:116
-msgid "Ports/Architectures"
-msgstr "Port/Architetture"
-
-#: ../../english/template/debian/links.tags.wml:119
-msgid "Installation manual"
-msgstr "Manuale d'installazione"
-
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD vendors"
-msgstr "Rivenditori di CD"
-
-#: ../../english/template/debian/links.tags.wml:125
-msgid "CD/USB ISO images"
-msgstr "Immagini ISO per CD/USB"
-
-#: ../../english/template/debian/links.tags.wml:128
-msgid "Network install"
-msgstr "Installazione via rete"
-
#: ../../english/template/debian/links.tags.wml:13
msgid "Weekly News"
msgstr "Notizie settimanali"
-#: ../../english/template/debian/links.tags.wml:131
-msgid "Pre-installed"
-msgstr "Preinstallato"
-
-#: ../../english/template/debian/links.tags.wml:134
-msgid "Debian-Edu project"
-msgstr "Progetto Debian-Edu"
-
-#: ../../english/template/debian/links.tags.wml:137
-msgid "Alioth &ndash; Debian GForge"
-msgstr "Alioth &ndash; Debian GForge"
-
-#: ../../english/template/debian/links.tags.wml:140
-msgid "Quality Assurance"
-msgstr "Controllo qualità"
-
-#: ../../english/template/debian/links.tags.wml:143
-msgid "Package Tracking System"
-msgstr "Sistema di tracciamento dei pacchetti"
-
-#: ../../english/template/debian/links.tags.wml:146
-msgid "Debian Developer's Packages Overview"
-msgstr "Introduzione ai pacchetti per sviluppatori Debian"
-
#: ../../english/template/debian/links.tags.wml:16
msgid "Debian Project News"
msgstr "Debian Project News"
@@ -357,10 +312,6 @@ msgstr "Libri su Debian"
msgid "Debian Wiki"
msgstr "Debian Wiki"
-#: ../../english/template/debian/links.tags.wml:4
-msgid "Debian International"
-msgstr "Debian diventa Internazionale"
-
#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Archivi delle liste di messaggi"
@@ -397,10 +348,6 @@ msgstr "FAQ Debian"
msgid "Debian Policy Manual"
msgstr "Manuale delle norme Debian"
-#: ../../english/template/debian/links.tags.wml:7
-msgid "Partners"
-msgstr "Partner"
-
#: ../../english/template/debian/links.tags.wml:70
msgid "Developers' Reference"
msgstr "Guida dello sviluppatore Debian"
@@ -441,10 +388,74 @@ msgstr "Archivi delle liste di messaggi del sistema di tracciamento dei bug"
msgid "Archives for miscellaneous mailing lists"
msgstr "Archivi delle liste di messaggi varie"
+#: ../../english/template/debian/links.tags.wml:101
+msgid "Free Software"
+msgstr "Software Libero"
+
+#: ../../english/template/debian/links.tags.wml:107
+msgid "Development"
+msgstr "Sviluppo"
+
+#: ../../english/template/debian/links.tags.wml:110
+msgid "Help Debian"
+msgstr "Aiutare Debian"
+
+#: ../../english/template/debian/links.tags.wml:113
+msgid "Bug reports"
+msgstr "Segnalazioni di bug"
+
+#: ../../english/template/debian/links.tags.wml:116
+msgid "Ports/Architectures"
+msgstr "Port/Architetture"
+
+#: ../../english/template/debian/links.tags.wml:119
+msgid "Installation manual"
+msgstr "Manuale d'installazione"
+
+#: ../../english/template/debian/links.tags.wml:122
+msgid "CD vendors"
+msgstr "Rivenditori di CD"
+
+#: ../../english/template/debian/links.tags.wml:125
+msgid "CD/USB ISO images"
+msgstr "Immagini ISO per CD/USB"
+
+#: ../../english/template/debian/links.tags.wml:128
+msgid "Network install"
+msgstr "Installazione via rete"
+
+#: ../../english/template/debian/links.tags.wml:131
+msgid "Pre-installed"
+msgstr "Preinstallato"
+
+#: ../../english/template/debian/links.tags.wml:134
+msgid "Debian-Edu project"
+msgstr "Progetto Debian-Edu"
+
+#: ../../english/template/debian/links.tags.wml:137
+msgid "Alioth &ndash; Debian GForge"
+msgstr "Alioth &ndash; Debian GForge"
+
+#: ../../english/template/debian/links.tags.wml:140
+msgid "Quality Assurance"
+msgstr "Controllo qualità"
+
+#: ../../english/template/debian/links.tags.wml:143
+msgid "Package Tracking System"
+msgstr "Sistema di tracciamento dei pacchetti"
+
+#: ../../english/template/debian/links.tags.wml:146
+msgid "Debian Developer's Packages Overview"
+msgstr "Introduzione ai pacchetti per sviluppatori Debian"
+
#: ../../english/template/debian/navbar.wml:10
msgid "Debian Home"
msgstr "Pagina principale di Debian"
+#: ../../english/template/debian/recent_list.wml:7
+msgid "No items for this year."
+msgstr "Nessun articolo per quest'anno."
+
#: ../../english/template/debian/recent_list.wml:11
msgid "proposed"
msgstr "proposto"
@@ -469,10 +480,6 @@ msgstr "ritirato"
msgid "Future events"
msgstr "Eventi futuri"
-#: ../../english/template/debian/recent_list.wml:303
-msgid "Report"
-msgstr "Segnalazione"
-
#: ../../english/template/debian/recent_list.wml:33
msgid "Past events"
msgstr "Eventi passati"
@@ -481,9 +488,9 @@ msgstr "Eventi passati"
msgid "(new revision)"
msgstr "(nuova revisione)"
-#: ../../english/template/debian/recent_list.wml:7
-msgid "No items for this year."
-msgstr "Nessun articolo per quest'anno."
+#: ../../english/template/debian/recent_list.wml:303
+msgid "Report"
+msgstr "Segnalazione"
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
@@ -512,6 +519,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Nota:</em> La pagina originale non esiste più."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
diff --git a/italian/po/vendors.it.po b/italian/po/vendors.it.po
index fdb110c64b0..c7e6f4db1cc 100644
--- a/italian/po/vendors.it.po
+++ b/italian/po/vendors.it.po
@@ -68,35 +68,35 @@ msgstr "sorgente"
msgid "and"
msgstr "e"
-#~ msgid "Vendor:"
-#~ msgstr "Venditore:"
+#~ msgid "Architectures:"
+#~ msgstr "Architetture:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL della pagina Debian:"
+#~ msgid "USB Type:"
+#~ msgstr "Tipo di USB:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Permette i contributi a Debian:"
+#~ msgid "BD Type:"
+#~ msgstr "Tipo di BD:"
-#~ msgid "Country:"
-#~ msgstr "Paese:"
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo di DVD:"
-#~ msgid "Ship International:"
-#~ msgstr "Consegne internazionali:"
+#~ msgid "CD Type:"
+#~ msgstr "Tipo di CD:"
#~ msgid "email:"
#~ msgstr "e-mail:"
-#~ msgid "CD Type:"
-#~ msgstr "Tipo di CD:"
+#~ msgid "Ship International:"
+#~ msgstr "Consegne internazionali:"
-#~ msgid "DVD Type:"
-#~ msgstr "Tipo di DVD:"
+#~ msgid "Country:"
+#~ msgstr "Paese:"
-#~ msgid "BD Type:"
-#~ msgstr "Tipo di BD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permette i contributi a Debian:"
-#~ msgid "USB Type:"
-#~ msgstr "Tipo di USB:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL della pagina Debian:"
-#~ msgid "Architectures:"
-#~ msgstr "Architetture:"
+#~ msgid "Vendor:"
+#~ msgstr "Venditore:"
diff --git a/japanese/po/blends.ja.po b/japanese/po/blends.ja.po
index ed4be78e74b..beba8d71e58 100644
--- a/japanese/po/blends.ja.po
+++ b/japanese/po/blends.ja.po
@@ -18,13 +18,25 @@ msgstr "派生物"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Debian Astro の目標は天文学者及び趣味で天体観測を行う人の両方の要求に応える "
+"Debian ベースのオペレーティングシステムを開発することです。天体望遠鏡の制御や"
+"データ整理、展示その他の領域を対象とする大量のソフトウェアパッケージを統合し"
+"ます。"
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"DebiChem の目標は Debian を化学者にとっての日々の研究に適した基盤にすることで"
"す。"
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
#, fuzzy
#| msgid ""
#| "The goal of Debian Games is to provide games in Debian from arcade and "
@@ -36,7 +48,7 @@ msgstr ""
"Debian Games の目標はアーケードや恋愛物からシミュレーションや戦略まで、ゲーム"
"を Debian に提供することです。"
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -44,7 +56,7 @@ msgstr ""
"Debian Edu の目標は教育での利用や学校に適する Debian OS システムを提供するこ"
"とです。"
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -53,13 +65,13 @@ msgstr ""
"Information System\">GIS</abbr>) アプリケーションやそのユーザにとって最善の"
"ディストリビューションに開発することです。"
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr "Debian Junior の目標は Debian を使うことが楽しいOSにすることです。"
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -71,7 +83,7 @@ msgstr ""
"報学、そして診療所のIT基盤等に関連するフリーでオープンソースのソフトウェアを "
"Debian OS に統合します。"
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -79,7 +91,7 @@ msgstr ""
"Debian Multimedia の目標は Debian を音楽やマルチメディア向けに適した基盤にす"
"ることです。"
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -98,25 +110,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Debian Astro の目標は天文学者及び趣味で天体観測を行う人の両方の要求に応える "
-"Debian ベースのオペレーティングシステムを開発することです。天体望遠鏡の制御や"
-"データ整理、展示その他の領域を対象とする大量のソフトウェアパッケージを統合し"
-"ます。"
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Debian Design の目標はデザイナー向けのアプリケーションを提供することです。グ"
"ラフィックやウェブ、マルチメディア等のデザインが対象です。"
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -130,7 +130,7 @@ msgstr ""
"発をアフリカやアフガニスタン、インドネシア、ベトナム等多くの地域でできるよう"
"にすることです。"
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -144,7 +144,7 @@ msgstr ""
"り、デバイス上の Tor リレーを無線ルータの代わりにできるためデータはユーザの下"
"に残ります。"
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -153,7 +153,7 @@ msgstr ""
"ションその他を提供することで Debian におけるアマチュア無線での需要をサポート"
"することです。"
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -161,8 +161,8 @@ msgstr ""
"DebianParl の目標は世界中の議員や政治家及び職員の需要をサポートするアプリケー"
"ションを提供することです。"
-#~ msgid "Debian Games"
-#~ msgstr "Debian ゲーム"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian Accessibility"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian ゲーム"
diff --git a/japanese/po/bugs.ja.po b/japanese/po/bugs.ja.po
index 419a9495fa2..441b26539b4 100644
--- a/japanese/po/bugs.ja.po
+++ b/japanese/po/bugs.ja.po
@@ -156,149 +156,149 @@ msgstr "アーカイブされているもの"
msgid "Archived and Unarchived"
msgstr "アーカイブされているものとされていないものの両方"
-#~ msgid "Flags:"
-#~ msgstr "設定:"
+#~ msgid "security"
+#~ msgstr "セキュリティ (security)"
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "含めないタグ:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "マージしたバグを1度しか表示しない"
+#~ msgid "Include tag:"
+#~ msgstr "含めるタグ:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "状態や重要度の順に並べない"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "ヘッダ部分に目次を示さない"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "フッタ部分に統計を示さない"
+#~ msgid "wontfix"
+#~ msgstr "修正予定無 (wontfix)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上流 (upstream)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "再現不可能 (unreproducible)"
-#~ msgid "Package version:"
-#~ msgstr "パッケージバージョン:"
+#~ msgid "patch"
+#~ msgstr "パッチ (patch)"
-#~ msgid "Distribution:"
-#~ msgstr "ディストリビューション:"
+#~ msgid "moreinfo"
+#~ msgstr "追加情報 (moreinfo)"
-#~ msgid "bugs"
-#~ msgstr "バグ"
+#~ msgid "l10n"
+#~ msgstr "地域化 (l10n)"
-#~ msgid "open"
-#~ msgstr "オープン"
+#~ msgid "help"
+#~ msgstr "助けを求む (help)"
-#~ msgid "forwarded"
-#~ msgstr "上流に転送済"
+#~ msgid "fixed-upstream"
+#~ msgstr "上流で修正済 (fixed-upstream)"
-#~ msgid "pending"
-#~ msgstr "留保"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "experimental で修正済 (fixed-in-experimental)"
-#~ msgid "fixed"
-#~ msgstr "修正済"
+#~ msgid "d-i"
+#~ msgstr "インストーラ (d-i)"
-#~ msgid "Include status:"
-#~ msgstr "含める状態:"
+#~ msgid "confirmed"
+#~ msgstr "確認済 (confirmed)"
-#~ msgid "Exclude status:"
-#~ msgstr "含めない状態:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "致命的 (critical)"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny では無視 (lenny-ignore)"
-#~ msgid "grave"
-#~ msgstr "重大 (grave)"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "深刻 (serious)"
+#~ msgid "etch-ignore"
+#~ msgstr "etch では無視 (etch-ignore)"
-#~ msgid "important"
-#~ msgstr "重要 (important)"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "minor"
-#~ msgstr "軽度 (minor)"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge では無視 (sarge-ignore)"
-#~ msgid "wishlist"
-#~ msgstr "要望 (wishlist)"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "含める重要度:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "含めない重要度:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "含める重要度:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "要望 (wishlist)"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge では無視 (sarge-ignore)"
+#~ msgid "minor"
+#~ msgstr "軽度 (minor)"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "重要 (important)"
-#~ msgid "etch-ignore"
-#~ msgstr "etch では無視 (etch-ignore)"
+#~ msgid "serious"
+#~ msgstr "深刻 (serious)"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "重大 (grave)"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny では無視 (lenny-ignore)"
+#~ msgid "critical"
+#~ msgstr "致命的 (critical)"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "含めない状態:"
-#~ msgid "confirmed"
-#~ msgstr "確認済 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "含める状態:"
-#~ msgid "d-i"
-#~ msgstr "インストーラ (d-i)"
+#~ msgid "fixed"
+#~ msgstr "修正済"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "experimental で修正済 (fixed-in-experimental)"
+#~ msgid "pending"
+#~ msgstr "留保"
-#~ msgid "fixed-upstream"
-#~ msgstr "上流で修正済 (fixed-upstream)"
+#~ msgid "forwarded"
+#~ msgstr "上流に転送済"
-#~ msgid "help"
-#~ msgstr "助けを求む (help)"
+#~ msgid "open"
+#~ msgstr "オープン"
-#~ msgid "l10n"
-#~ msgstr "地域化 (l10n)"
+#~ msgid "bugs"
+#~ msgstr "バグ"
-#~ msgid "moreinfo"
-#~ msgstr "追加情報 (moreinfo)"
+#~ msgid "Distribution:"
+#~ msgstr "ディストリビューション:"
-#~ msgid "patch"
-#~ msgstr "パッチ (patch)"
+#~ msgid "Package version:"
+#~ msgstr "パッケージバージョン:"
-#~ msgid "unreproducible"
-#~ msgstr "再現不可能 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "上流 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "修正予定無 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "フッタ部分に統計を示さない"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "ヘッダ部分に目次を示さない"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "状態や重要度の順に並べない"
-#~ msgid "Include tag:"
-#~ msgstr "含めるタグ:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "マージしたバグを1度しか表示しない"
-#~ msgid "Exclude tag:"
-#~ msgstr "含めないタグ:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
-#~ msgid "security"
-#~ msgstr "セキュリティ (security)"
+#~ msgid "Flags:"
+#~ msgstr "設定:"
diff --git a/japanese/po/doc.ja.po b/japanese/po/doc.ja.po
index 6ba4e343283..91090c74e30 100644
--- a/japanese/po/doc.ja.po
+++ b/japanese/po/doc.ja.po
@@ -56,8 +56,8 @@ msgstr ""
" ネットワークマネージャ等を利用してホームネットワークを管理します。\n"
" この本による利益の1割が Debian プロジェクトに寄付されます。"
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
#, fuzzy
#| msgid ""
#| "Written by two Debian developers, this free book\n"
@@ -112,44 +112,7 @@ msgstr ""
" 自らシステムをインストールしてメンテナンスするユーザのための、\n"
" 基本的なサポートを網羅しています。"
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 ARM アーキテクチャ版"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-" 本書は ARM プロセッサ用 GNU/Linux の開発者のための本です。\n"
-" いくつかのデバイス (LART, Assabet, Psion5) を、\n"
-" すばやく設定する方法が記述されています。\n"
-" さらに、一般的な情報、ツール、テクニックも扱います。\n"
-" GNU toolchain をネイティブ/クロスコンパイラとして使う方法を、\n"
-" ブートローダ、カーネルパッチ、RAM ディスク、ARM の癖、ARM のリソース\n"
-" などにわたってカバーします。\n"
-" また、他のプラットフォームから移ってきた開発者のために、\n"
-" GNU/Linux の基本に関する膨大なチュートリアル情報も含まれています。\n"
-" Debian ではありませんが、Aleph ARMLinux ディストリビューションは\n"
-" ほぼ Debian-ARM をベースにしています。\n"
-" また読者はこのディストリビューションから初めて、\n"
-" Debian ベースのホストマシンを構築できるようになっています。"
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -169,7 +132,7 @@ msgstr ""
" Debian を使って信頼性のあるネットワークを構築したい管理者など、\n"
" 多くの人々にとって興味深いものとなっています。"
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
#, fuzzy
#| msgid ""
#| "The book covers topics ranging from concepts of package \n"
@@ -196,7 +159,7 @@ msgstr ""
"フォーマット: e-book (オンライン、HTML、PDF、ePub、Mobi)\n"
"書籍化の予定もあります。\n"
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
#, fuzzy
#| msgid ""
#| "This book teaches you how to install and configure the system and also "
@@ -215,6 +178,22 @@ msgstr ""
"ン 6.0) のあらゆる潜在能力を示し、Debian およびその対応業務の範囲について理解"
"しようとする全ユーザに実用的なマニュアルを提供します。"
+#: ../../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 "著者名:"
@@ -267,13 +246,13 @@ msgstr "(バージョン <get-var version />)"
msgid "plain text"
msgstr "プレーンテキスト"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/cvs"
-"\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+"最新の <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
@@ -301,14 +280,6 @@ msgstr ""
"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
"subversion\">Subversion</a> リポジトリ経由で利用できるようになっています。"
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/git"
-"\">Git</a> リポジトリ経由で利用できるようになっています。"
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -340,157 +311,119 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
-#~ msgstr ""
-#~ "これはフリーソフトウェアだけを使った基礎的、あるいは複雑な IT 基盤の作り方"
-#~ "について学ぶのに適した本です。検討された幅広い手順が示され、技術的基盤の実"
-#~ "装について最善の実践となるよう調整されています。この読みやすく総合的なガイ"
-#~ "ドはDebian GNU/Linux オペレーティングシステムを使って特定の目的を実現する"
-#~ "ための手ほどきとなるでしょう。"
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "インストーラと選り抜きのパッケージを収録した Sarge CD"
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "この本は 4 章に分かれています。基本概念、GNU/Linux の運用、\n"
-#~ " システム管理と高度な操作です。\n"
-#~ " 各章ではオペレーティングシステムの機能について徹底的に説明しています。\n"
-#~ " 最初の章では GNU/Linux の構造について説明しています。\n"
-#~ " システムがプロセッサやメモリといった基本的なリソースをどうやって使うのか"
-#~ "を\n"
-#~ " 読者が理解する助けになります。\n"
-#~ " Ext2, Ext3, あるいは ReiserFS といったファイルシステムの詳細な分析によ"
-#~ "り、\n"
-#~ " ユーザがその必要性に応じて正しい選択をすることが可能になるでしょう。\n"
-#~ " 多くの図表が本全体を通してシステムの性能について全体像を示します。\n"
-#~ " GNU/Linux を詳細に学習する学生その他の人を対象としています。\n"
-#~ " この本は Debian Sarge を対象としています。"
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Knoppix 収録のライブ CD"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "ペルシャ語初の Debian GNU/Linux 本です。この書籍は、Debian GNU/Linux\n"
-#~ " のインストールや、ウェブ・データベース・ファイアウォール・メール・ftp\n"
-#~ " などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
-#~ " や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
+#~ " 初心者や上級ユーザにとって、この本は Debian をデスクトップ、\n"
+#~ " イントラネット・インターネットのサーバ、\n"
+#~ " 開発用途に利用する際の総合的な情報源となっています。\n"
+#~ " Debian プロジェクトの背景に関する情報や、広範囲に及ぶ Debian\n"
+#~ " 独自のパッケージ管理システムにも触れています。"
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "本書は読者に Debian GNU/Linux を紹介し、\n"
-#~ " 実践的なチュートリアルやヒントを満載しています。\n"
-#~ " 韓国語で書かれており、Debian GNU/Linux システム\n"
-#~ " のあらゆる部分を扱っています。\n"
-#~ " 初めてのセットアップ、パッケージのインストール、\n"
-#~ " X のセットアップ、インターネット接続、ネットワーク保守、などです。\n"
-#~ " さらに本書では、\n"
-#~ " 韓国語環境を Debian にセットアップするためのヒントも少々提供していま"
-#~ "す。\n"
-#~ " 初心者にも適しています。"
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "公式 potato r3 CD と非公式 woody CD"
+#~ " この本は、Debian オペレーティングシステムの概念と技術を、\n"
+#~ " 利用方法や陥りがちな場面を挙げながら紹介し、\n"
+#~ " 各アプローチの背景にある考え方を説明しています。リファレンス本に留まら"
+#~ "ず、\n"
+#~ " プロジェクトやオペレーティングシステムの洗練されたエレガントな仕組み"
+#~ "や、\n"
+#~ " またときには過去 10 年間にわたって Debian システムの一部として展開されて"
+#~ "きた、\n"
+#~ " 一見直感的ではないソリューションに関する識見を読者に与えることを目的とし"
+#~ "ています。\n"
+#~ " UNIX/Linux に詳しい管理者を対象としてはいますが、この本は標準的な "
+#~ "Linux\n"
+#~ " のリファレンスとしても優れた情報源として Debian\n"
+#~ " のボトムアップな考え方を通じて、自力で Linux を経験するために役立ちま"
+#~ "す。"
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "この本は、Debian GNU/Linux のインストールの簡潔なガイド、\n"
-#~ " Unix や Linux コマンドの基礎、Debian GNU/Linux のシステムや\n"
-#~ " ネットワークに関する基本的な設定やメンテナンス、\n"
-#~ " X Window System のセットアップ、マルチメディアの使用について\n"
-#~ " 韓国語で述べています。\n"
-#~ " また、メンテナのためのガイドも扱い、\n"
-#~ " 韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
-
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
+#~ "Debian GNU/Linux システムの手頃なリファレンスガイドで、\n"
+#~ " 1,500以上の「レシピ」を紹介し、\n"
+#~ " 日々の生活で Debian をどの様に使うかを紹介します。\n"
+#~ " テキストでの作業、画像やサウンドの作成、\n"
+#~ " ネットワークに関する問題などです。\n"
+#~ " この本の対象になっているソフトウェアと同じく、\n"
+#~ " この本もコピーレフトになっていて、\n"
+#~ " データソースが入手できます。"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "この本は、Debian GNU/Linux に関する一般的な話題を扱っています。\n"
-#~ " インストール、APT と DPKG、シェル、X Window System、ネットワーク、\n"
-#~ " システム管理、カーネル設定、Windows との共有、サーバ構築、などです。\n"
-#~ " カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
-#~ " 簡単にインストール・使用することができます。"
+#~ " Learning Debian GNU/Linux は、\n"
+#~ " Debian GNU/Linux のインストールと設定を通して、\n"
+#~ " Linux を初めて使うユーザをガイドします。\n"
+#~ " Windows ユーザは、\n"
+#~ " Bill McCarty のこの Learning Debian GNU/Linux によって、\n"
+#~ " エキサイティングなコンピューティングワールドへの\n"
+#~ " 親切な手引きを得ることができるでしょう。"
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "本書は、Debian のスタンダードバイブルとして支持を受けているシリーズの、\n"
-#~ " Sarge 対応最新刊です。本書では、Debian GNU/Linux 3.1 Sarge\n"
-#~ " を使う上でのすべての面——インストール、デスクトップ環境、システム管理、\n"
-#~ " サーバ設定など——をカバーしています。さらに、\n"
-#~ " 本書はデスクトップを飾る商用フォントパッケージも収録しています。\n"
-#~ " 初心者から熟練ユーザまですべての Debian ユーザにとって便利な本でしょう。"
+#~ "230 ページ以上の本と 3 枚の CD-ROM が含まれています。\n"
+#~ " Debian Linux、ネットワーキング、プログラミングツール、GUI、\n"
+#~ " デスクトップパブリシング、ビジネス、おもしろい物、マルチメディア\n"
+#~ " などを扱っています。30 日間のフリーな電子メールサポートが含まれていま"
+#~ "す。"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "Debian Squeeze i386/amd64 DVD 版"
+
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 種類あります: DVD 付属無しと DVD 2 枚 (i386 収録) 付き"
+
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze 6.0.1a, Multi-Arch (i386 および amd64) DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "本書は、辞書形式で、初級者から中級者までを対象に、\n"
-#~ " いろいろなインストール方法、デスクトップのカスタマイズ、\n"
-#~ " トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介し"
-#~ "ています。"
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge インストーラ (シングルサイズ CD)"
+#~ "2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -526,116 +459,197 @@ msgstr "PDF"
#~ " Windows ベースのクライアント用サーバ (SAMBA)\n"
#~ " の設計・構築のような、ネットワーク構築とシステム管理の話題です。"
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge インストーラ (シングルサイズ CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
+#~ "本書は、辞書形式で、初級者から中級者までを対象に、\n"
+#~ " いろいろなインストール方法、デスクトップのカスタマイズ、\n"
+#~ " トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介し"
+#~ "ています。"
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze 6.0.1a, Multi-Arch (i386 および amd64) DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 種類あります: DVD 付属無しと DVD 2 枚 (i386 収録) 付き"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "本書は、Debian のスタンダードバイブルとして支持を受けているシリーズの、\n"
+#~ " Sarge 対応最新刊です。本書では、Debian GNU/Linux 3.1 Sarge\n"
+#~ " を使う上でのすべての面——インストール、デスクトップ環境、システム管理、\n"
+#~ " サーバ設定など——をカバーしています。さらに、\n"
+#~ " 本書はデスクトップを飾る商用フォントパッケージも収録しています。\n"
+#~ " 初心者から熟練ユーザまですべての Debian ユーザにとって便利な本でしょう。"
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "Debian Squeeze i386/amd64 DVD 版"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "230 ページ以上の本と 3 枚の CD-ROM が含まれています。\n"
-#~ " Debian Linux、ネットワーキング、プログラミングツール、GUI、\n"
-#~ " デスクトップパブリシング、ビジネス、おもしろい物、マルチメディア\n"
-#~ " などを扱っています。30 日間のフリーな電子メールサポートが含まれていま"
-#~ "す。"
+#~ "この本は、Debian GNU/Linux に関する一般的な話題を扱っています。\n"
+#~ " インストール、APT と DPKG、シェル、X Window System、ネットワーク、\n"
+#~ " システム管理、カーネル設定、Windows との共有、サーバ構築、などです。\n"
+#~ " カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
+#~ " 簡単にインストール・使用することができます。"
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ " Learning Debian GNU/Linux は、\n"
-#~ " Debian GNU/Linux のインストールと設定を通して、\n"
-#~ " Linux を初めて使うユーザをガイドします。\n"
-#~ " Windows ユーザは、\n"
-#~ " Bill McCarty のこの Learning Debian GNU/Linux によって、\n"
-#~ " エキサイティングなコンピューティングワールドへの\n"
-#~ " 親切な手引きを得ることができるでしょう。"
+#~ "この本は、Debian GNU/Linux のインストールの簡潔なガイド、\n"
+#~ " Unix や Linux コマンドの基礎、Debian GNU/Linux のシステムや\n"
+#~ " ネットワークに関する基本的な設定やメンテナンス、\n"
+#~ " X Window System のセットアップ、マルチメディアの使用について\n"
+#~ " 韓国語で述べています。\n"
+#~ " また、メンテナのためのガイドも扱い、\n"
+#~ " 韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "公式 potato r3 CD と非公式 woody CD"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Debian GNU/Linux システムの手頃なリファレンスガイドで、\n"
-#~ " 1,500以上の「レシピ」を紹介し、\n"
-#~ " 日々の生活で Debian をどの様に使うかを紹介します。\n"
-#~ " テキストでの作業、画像やサウンドの作成、\n"
-#~ " ネットワークに関する問題などです。\n"
-#~ " この本の対象になっているソフトウェアと同じく、\n"
-#~ " この本もコピーレフトになっていて、\n"
-#~ " データソースが入手できます。"
+#~ "本書は読者に Debian GNU/Linux を紹介し、\n"
+#~ " 実践的なチュートリアルやヒントを満載しています。\n"
+#~ " 韓国語で書かれており、Debian GNU/Linux システム\n"
+#~ " のあらゆる部分を扱っています。\n"
+#~ " 初めてのセットアップ、パッケージのインストール、\n"
+#~ " X のセットアップ、インターネット接続、ネットワーク保守、などです。\n"
+#~ " さらに本書では、\n"
+#~ " 韓国語環境を Debian にセットアップするためのヒントも少々提供していま"
+#~ "す。\n"
+#~ " 初心者にも適しています。"
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ " この本は、Debian オペレーティングシステムの概念と技術を、\n"
-#~ " 利用方法や陥りがちな場面を挙げながら紹介し、\n"
-#~ " 各アプローチの背景にある考え方を説明しています。リファレンス本に留まら"
-#~ "ず、\n"
-#~ " プロジェクトやオペレーティングシステムの洗練されたエレガントな仕組み"
-#~ "や、\n"
-#~ " またときには過去 10 年間にわたって Debian システムの一部として展開されて"
-#~ "きた、\n"
-#~ " 一見直感的ではないソリューションに関する識見を読者に与えることを目的とし"
-#~ "ています。\n"
-#~ " UNIX/Linux に詳しい管理者を対象としてはいますが、この本は標準的な "
-#~ "Linux\n"
-#~ " のリファレンスとしても優れた情報源として Debian\n"
-#~ " のボトムアップな考え方を通じて、自力で Linux を経験するために役立ちま"
-#~ "す。"
+#~ "ペルシャ語初の Debian GNU/Linux 本です。この書籍は、Debian GNU/Linux\n"
+#~ " のインストールや、ウェブ・データベース・ファイアウォール・メール・ftp\n"
+#~ " などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
+#~ " や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "この本は 4 章に分かれています。基本概念、GNU/Linux の運用、\n"
+#~ " システム管理と高度な操作です。\n"
+#~ " 各章ではオペレーティングシステムの機能について徹底的に説明しています。\n"
+#~ " 最初の章では GNU/Linux の構造について説明しています。\n"
+#~ " システムがプロセッサやメモリといった基本的なリソースをどうやって使うのか"
+#~ "を\n"
+#~ " 読者が理解する助けになります。\n"
+#~ " Ext2, Ext3, あるいは ReiserFS といったファイルシステムの詳細な分析によ"
+#~ "り、\n"
+#~ " ユーザがその必要性に応じて正しい選択をすることが可能になるでしょう。\n"
+#~ " 多くの図表が本全体を通してシステムの性能について全体像を示します。\n"
+#~ " GNU/Linux を詳細に学習する学生その他の人を対象としています。\n"
+#~ " この本は Debian Sarge を対象としています。"
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ " 初心者や上級ユーザにとって、この本は Debian をデスクトップ、\n"
-#~ " イントラネット・インターネットのサーバ、\n"
-#~ " 開発用途に利用する際の総合的な情報源となっています。\n"
-#~ " Debian プロジェクトの背景に関する情報や、広範囲に及ぶ Debian\n"
-#~ " 独自のパッケージ管理システムにも触れています。"
+#~ "これはフリーソフトウェアだけを使った基礎的、あるいは複雑な IT 基盤の作り方"
+#~ "について学ぶのに適した本です。検討された幅広い手順が示され、技術的基盤の実"
+#~ "装について最善の実践となるよう調整されています。この読みやすく総合的なガイ"
+#~ "ドはDebian GNU/Linux オペレーティングシステムを使って特定の目的を実現する"
+#~ "ための手ほどきとなるでしょう。"
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Knoppix 収録のライブ CD"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/"
+#~ "cvs\">Subversion</a> リポジトリ経由で利用できるようになっています。"
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "インストーラと選り抜きのパッケージを収録した Sarge CD"
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ " 本書は ARM プロセッサ用 GNU/Linux の開発者のための本です。\n"
+#~ " いくつかのデバイス (LART, Assabet, Psion5) を、\n"
+#~ " すばやく設定する方法が記述されています。\n"
+#~ " さらに、一般的な情報、ツール、テクニックも扱います。\n"
+#~ " GNU toolchain をネイティブ/クロスコンパイラとして使う方法を、\n"
+#~ " ブートローダ、カーネルパッチ、RAM ディスク、ARM の癖、ARM のリソース\n"
+#~ " などにわたってカバーします。\n"
+#~ " また、他のプラットフォームから移ってきた開発者のために、\n"
+#~ " GNU/Linux の基本に関する膨大なチュートリアル情報も含まれています。\n"
+#~ " Debian ではありませんが、Aleph ARMLinux ディストリビューションは\n"
+#~ " ほぼ Debian-ARM をベースにしています。\n"
+#~ " また読者はこのディストリビューションから初めて、\n"
+#~ " Debian ベースのホストマシンを構築できるようになっています。"
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 ARM アーキテクチャ版"
diff --git a/japanese/po/mailinglists.ja.po b/japanese/po/mailinglists.ja.po
index 26e04f7923d..cbba9dad9e1 100644
--- a/japanese/po/mailinglists.ja.po
+++ b/japanese/po/mailinglists.ja.po
@@ -126,8 +126,8 @@ msgstr "誰でも可能"
msgid "closed"
msgstr "クローズド"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "脱退したいメーリングリストを選んでください:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "購読したいメーリングリストを選んでください:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "脱退したいメーリングリストを選んでください:"
diff --git a/japanese/po/organization.ja.po b/japanese/po/organization.ja.po
index 5fc21b26379..febd1b5330b 100644
--- a/japanese/po/organization.ja.po
+++ b/japanese/po/organization.ja.po
@@ -72,22 +72,22 @@ msgid "Officers"
msgstr "執行部"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "ディストリビューション"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "広報チーム"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "サポートと設備"
@@ -104,181 +104,181 @@ msgstr "リーダー"
msgid "Technical Committee"
msgstr "技術委員会"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "書記"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "開発プロジェクト"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP アーカイブ"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP マスター"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP アシスタント"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "FTP ウィザード"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Backports チーム"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "個々のパッケージ"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "リリース管理"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "リリースチーム"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "品質保証"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "インストールシステムチーム"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "リリースノート"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD イメージ"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "製品"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "テスト"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "オートビルドインフラ"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "ビルド要求チーム"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "ビルドデーモン管理"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "ドキュメンテーション"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "作業の必要なパッケージ一覧"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "ライブシステムチーム"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "移植"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "特殊な設定"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "ラップトップ"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "ファイアウォール"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "組み込みシステム"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "広報窓口"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "ウェブページ"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "教育"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Debian Women プロジェクト"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "嫌がらせ反対"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "イベント"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "技術委員会"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "パートナープログラム"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "ハードウェア寄付コーディネーション"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "ユーザサポート"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "バグ追跡システム (BTS)"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "メーリングリスト管理とメーリングリストアーカイブ"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "新規メンバー受付"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debian アカウント管理者"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -286,31 +286,31 @@ msgstr ""
"(全) DAM に私信のメールを送る際には 57731224A9762EA155AB2A530CA8D15BB24D96F2 "
"の GPG 鍵を使ってください。"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "公開鍵管理者 (PGP および GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "セキュリティチーム"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "コンサルタントページ"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "CD ベンダページ"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "ポリシー"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "システム管理"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -319,7 +319,7 @@ msgstr ""
"ストールの依頼など、Debianマシンのいずれかに何か問題のある際に用いる連絡先で"
"す。"
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -329,64 +329,82 @@ msgstr ""
"\">Debian マシン</a>のページを参照してください。そこにはマシンごとの管理情報"
"があります。"
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開発者ディレクトリ管理者"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "ミラー"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "パッケージ追跡システム"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "監事"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr "<a name=\"trademark\" href=\"m4_HOME/trademark\">商標</a>利用申請"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth 管理者"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth 管理者"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "1歳から99歳までのこどものための Debian"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "臨床医学と医学研究のための Debian"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "教育のための Debian"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "法律事務所のための Debian"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "障害者のための Debian"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "科学研究のための Debian"
-#~ msgid "Publicity"
-#~ msgstr "広報"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "教育のための Debian"
+
+#~ msgid "DebConf chairs"
+#~ msgstr "DebConf 役員"
#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
#~ msgstr "Debian メンテナ (DM) 公開鍵管理者"
-#~ msgid "DebConf chairs"
-#~ msgstr "DebConf 役員"
+#~ msgid "Publicity"
+#~ msgstr "広報"
+
+#~ msgid "Auditor"
+#~ msgstr "監事"
+
+#~ msgid "Live System Team"
+#~ msgstr "ライブシステムチーム"
diff --git a/japanese/po/others.ja.po b/japanese/po/others.ja.po
index e41ec0dc39d..f6964604e8c 100644
--- a/japanese/po/others.ja.po
+++ b/japanese/po/others.ja.po
@@ -323,17 +323,17 @@ msgstr "バージョン"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "場所:"
+#~ msgid "Wanted:"
+#~ msgstr "必要なハードウェア:"
-#~ msgid "Specifications:"
-#~ msgstr "スペック:"
+#~ msgid "Who:"
+#~ msgstr "必要としている人/グループ:"
#~ msgid "Architecture:"
#~ msgstr "アーキテクチャ:"
-#~ msgid "Who:"
-#~ msgstr "必要としている人/グループ:"
+#~ msgid "Specifications:"
+#~ msgstr "スペック:"
-#~ msgid "Wanted:"
-#~ msgstr "必要なハードウェア:"
+#~ msgid "Where:"
+#~ msgstr "場所:"
diff --git a/japanese/po/partners.ja.po b/japanese/po/partners.ja.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/japanese/po/partners.ja.po
+++ b/japanese/po/partners.ja.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/japanese/po/ports.ja.po b/japanese/po/ports.ja.po
index 67f2fc68ea0..c065eafbc7b 100644
--- a/japanese/po/ports.ja.po
+++ b/japanese/po/ports.ja.po
@@ -113,135 +113,135 @@ msgstr "PowerPC 用 Debian"
msgid "Debian for Sparc"
msgstr "Sparc 用 Debian"
-#~ msgid "Debian for Laptops"
-#~ msgstr "ラップトップ用 Debian"
-
-#~ msgid "Vendor/Name"
-#~ msgstr "ベンダ/名称"
-
-#~ msgid "Date announced"
-#~ msgstr "アナウンス日"
-
-#~ msgid "Clock"
-#~ msgstr "クロック"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Motorola 680x0 用 Debian"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Debian for AMD64"
+#~ msgstr "AMD64 用 Debian"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Debian for ARM"
+#~ msgstr "ARM 用 Debian"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Beowulf 用 Debian"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Main"
+#~ msgstr "メイン"
-#~ msgid "Specials"
-#~ msgstr "特記事項"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "FPU なし (R2010)、外部キャッシュ"
+#~ msgid "Debian for MIPS"
+#~ msgstr "MIPS 用 Debian"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "FPU なし (R3010)"
+#~ msgid "Debian for S/390"
+#~ msgstr "S/390 用 Debian"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Sparc64 用 Debian"
-#~ msgid "External L1 cache"
-#~ msgstr "外部 L1 キャッシュ"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
+#~ "ボード、USB、タッチパッド、オーディオ"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "複数チップ CPU"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr ""
+#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
#~ msgstr ""
-#~ "Mips16 isa 拡張、FPU なし、512k フラッシュ、16k ram、DMAC、UART、タイ"
-#~ "マー、I2C、ウォッチドッグ"
+#~ "Mips 16、RTC、キーボード、タッチパッド、オーディオ、コンパクトフラッシュ、"
+#~ "UART、パラレル"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 キャッシュオンダイ"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、PCIC、UART、タイマー"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU、64 ビット外部バス、外部 L2 キャッシュ"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "FPU なし、SDRAMC、ROMC、タイマー、PCMCIA、LCD コントローラ、IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU、64 ビット外部バス"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、LCD コントローラ、IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU、32 ビット外部バス"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "10/100 イーサネット x2、UART x4、IrDA、AC'97、I2C、デジタル I/O x38"
#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
#~ msgstr "FPU なし、SDRAMC、ROMC、DMAC、PCIC、UART、タイマー"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "10/100 イーサネット x2、UART x4、IrDA、AC'97、I2C、デジタル I/O x38"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、IrDA"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU、32 ビット外部バス"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、LCD コントローラ、IrDA"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU、64 ビット外部バス"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "FPU なし、SDRAMC、ROMC、タイマー、PCMCIA、LCD コントローラ、IrDA"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU、64 ビット外部バス、外部 L2 キャッシュ"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、PCIC、UART、タイマー"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 キャッシュオンダイ"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
#~ msgstr ""
-#~ "Mips 16、RTC、キーボード、タッチパッド、オーディオ、コンパクトフラッシュ、"
-#~ "UART、パラレル"
+#~ "Mips16 isa 拡張、FPU なし、512k フラッシュ、16k ram、DMAC、UART、タイ"
+#~ "マー、I2C、ウォッチドッグ"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr ""
-#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "複数チップ CPU"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
-#~ "ボード、USB、タッチパッド、オーディオ"
+#~ msgid "External L1 cache"
+#~ msgstr "外部 L1 キャッシュ"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Sparc64 用 Debian"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
-#~ msgid "Debian for S/390"
-#~ msgstr "S/390 用 Debian"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "FPU なし (R3010)"
-#~ msgid "Debian for MIPS"
-#~ msgstr "MIPS 用 Debian"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "FPU なし (R2010)、外部キャッシュ"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Specials"
+#~ msgstr "特記事項"
-#~ msgid "Main"
-#~ msgstr "メイン"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Beowulf 用 Debian"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Debian for ARM"
-#~ msgstr "ARM 用 Debian"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Debian for AMD64"
-#~ msgstr "AMD64 用 Debian"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Motorola 680x0 用 Debian"
+#~ msgid "Clock"
+#~ msgstr "クロック"
+
+#~ msgid "Date announced"
+#~ msgstr "アナウンス日"
+
+#~ msgid "Vendor/Name"
+#~ msgstr "ベンダ/名称"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "ラップトップ用 Debian"
diff --git a/japanese/po/stats.ja.po b/japanese/po/stats.ja.po
index cefe1465399..5daeb89427c 100644
--- a/japanese/po/stats.ja.po
+++ b/japanese/po/stats.ja.po
@@ -25,79 +25,90 @@ msgstr "翻訳するバイト数 %d"
msgid "There are %d strings to translate."
msgstr "翻訳する文の数 %d"
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "翻訳が古すぎです"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "翻訳のバージョン番号が変です"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "翻訳が古すぎです"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "原版がこの翻訳より新しくなっています"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "原版がなくなっています"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "ヒットカウント無し"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "ヒット"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "クリックすると diffstat データを取得します"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "差分(統合)"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "差分(色分け)"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "差分(色分け)"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "翻訳状況:"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "未翻訳"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "未更新"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "翻訳済"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "最新"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "ファイル"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "バイト"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -105,136 +116,136 @@ msgstr ""
"注: このページのリストは人気順に並んでいます。ページ名にマウスカーソルを持っ"
"て行くとヒット数を確認できます。"
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "古くなっている翻訳"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "ファイル"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "差分"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "状態"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "ログ"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "翻訳版"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "担当者"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "状態"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "翻訳者"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "日時"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "未翻訳の一般ページ"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "未翻訳の一般ページ"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "未翻訳のニュース項目"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "未翻訳のニュース項目"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "未翻訳のコンサルタント/ユーザページ"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "未翻訳のコンサルタント/ユーザページ"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "未翻訳の国際化ページ"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "未翻訳の国際化ページ"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "翻訳済ページ (最新)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "翻訳済テンプレート (PO ファイル)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "PO 翻訳状況"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Fuzzy"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "未翻訳"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "合計"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "合計:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "翻訳済ページ"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "ページ単位で集計した翻訳状況"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "言語"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "翻訳版"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "翻訳済ページ (サイズ)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "ページサイズから見た翻訳状況"
-#~ msgid "Created with"
-#~ msgstr "Created with"
-
#~ msgid "Origin"
#~ msgstr "原版"
+
+#~ msgid "Created with"
+#~ msgstr "Created with"
diff --git a/japanese/po/templates.ja.po b/japanese/po/templates.ja.po
index ce8931adde9..3d710ffe8cc 100644
--- a/japanese/po/templates.ja.po
+++ b/japanese/po/templates.ja.po
@@ -201,11 +201,11 @@ msgstr "リリース 2.2 において"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"ウェブサイトの問題を報告するには、<a href=\"mailto:debian-www@lists.debian."
"org\">debian-www@lists.debian.org</a> にメールを送ってください。その他の連絡"
@@ -500,6 +500,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>注意:</em> 原文はもう存在しません。"
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
diff --git a/korean/po/bugs.ko.po b/korean/po/bugs.ko.po
index d21415f3943..b38719ce768 100644
--- a/korean/po/bugs.ko.po
+++ b/korean/po/bugs.ko.po
@@ -161,17 +161,17 @@ msgstr ""
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "security"
-#~ msgstr "보안"
+#~ msgid "bugs"
+#~ msgstr "버그"
-#~ msgid "patch"
-#~ msgstr "패치"
+#~ msgid "l10n"
+#~ msgstr "지역화"
#~ msgid "moreinfo"
#~ msgstr "추가 정보"
-#~ msgid "l10n"
-#~ msgstr "지역화"
+#~ msgid "patch"
+#~ msgstr "패치"
-#~ msgid "bugs"
-#~ msgstr "버그"
+#~ msgid "security"
+#~ msgstr "보안"
diff --git a/korean/po/countries.ko.po b/korean/po/countries.ko.po
index 1f3af41f60f..66ddd99f202 100644
--- a/korean/po/countries.ko.po
+++ b/korean/po/countries.ko.po
@@ -431,8 +431,8 @@ msgstr "남아프리카 공화국"
msgid "Zimbabwe"
msgstr "짐바브웨"
-#~ msgid "Great Britain"
-#~ msgstr "영국"
-
#~ msgid "Yugoslavia"
#~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "영국"
diff --git a/korean/po/distrib.ko.po b/korean/po/distrib.ko.po
index 142f21197a7..f56ae661093 100644
--- a/korean/po/distrib.ko.po
+++ b/korean/po/distrib.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-02-02 21:01+0900\n"
"Last-Translator: 세벌 <sebuls@gmail.com>\n"
"Language-Team: debian-kr-www <debian-kr-www@lists.debian.or.kr>\n"
@@ -12,7 +13,6 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
"X-Generator: Poedit 1.8.7.1\n"
#: ../../english/distrib/search_contents-form.inc:9
@@ -206,17 +206,17 @@ msgstr ""
msgid "SPARC"
msgstr ""
-#~ msgid "Search case sensitive"
-#~ msgstr "대소문자 구분 검색"
+#~ msgid "Case sensitive"
+#~ msgstr "대소문자 구분"
-#~ msgid "Intel x86"
-#~ msgstr "인텔 x86"
+#~ msgid "no"
+#~ msgstr "아니오"
#~ msgid "yes"
#~ msgstr "예"
-#~ msgid "no"
-#~ msgstr "아니오"
+#~ msgid "Intel x86"
+#~ msgstr "인텔 x86"
-#~ msgid "Case sensitive"
-#~ msgstr "대소문자 구분"
+#~ msgid "Search case sensitive"
+#~ msgstr "대소문자 구분 검색"
diff --git a/korean/po/doc.ko.po b/korean/po/doc.ko.po
index ea156eaf2db..8a1b549802b 100644
--- a/korean/po/doc.ko.po
+++ b/korean/po/doc.ko.po
@@ -155,10 +155,10 @@ msgstr ""
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -183,12 +183,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
diff --git a/korean/po/mailinglists.ko.po b/korean/po/mailinglists.ko.po
index 449a1c12522..2fa4a8218ff 100644
--- a/korean/po/mailinglists.ko.po
+++ b/korean/po/mailinglists.ko.po
@@ -112,8 +112,8 @@ msgstr ""
msgid "closed"
msgstr ""
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "해지하려는 리스트를 선택하세요."
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "가입하려는 리스트를 선택하세요."
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "해지하려는 리스트를 선택하세요."
diff --git a/korean/po/organization.ko.po b/korean/po/organization.ko.po
index 3a6d46e83de..b78a2e1fd3d 100644
--- a/korean/po/organization.ko.po
+++ b/korean/po/organization.ko.po
@@ -77,22 +77,22 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr ""
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr ""
@@ -109,316 +109,320 @@ msgstr ""
msgid "Technical Committee"
msgstr "기술 위원회"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "개발 프로젝트"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP 저장소"
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "릴리스 관리"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
#, fuzzy
#| msgid "Release Wizard"
msgid "Release Team"
msgstr "릴리스 마법사"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "품질 보증"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "설치 시스템 팀"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD 이미지"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "문서"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "방화벽"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "웹 페이지"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "데비안 여성 프로젝트"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "행사"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "기술 위원회"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "사용자 지원"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "버그 추적 시스템"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "개발자 계정 관리자"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "키링 관리자(PGP와 GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "보안 팀"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "자문 페이지"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "CD 판매사 페이지"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "정책"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr ""
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
"contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "미러"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS 관리자"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "패키지 추적 시스템"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:444
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:453
+msgid "Salsa administrators"
+msgstr ""
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "의학 실습과 연구를 위한 데비안"
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "교육을 위한 데비안"
-#: ../../english/intro/organization.data:472
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:476
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "장애우를 위한 데비안"
-#: ../../english/intro/organization.data:480
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "의학 실습과 연구를 위한 데비안"
-#: ../../english/intro/organization.data:483
+#: ../../english/intro/organization.data:492
#, fuzzy
#| msgid "Debian for education"
msgid "Debian for astronomy"
msgstr "교육을 위한 데비안"
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "보안 팀"
-
-#~ msgid "Security Audit Project"
-#~ msgstr "보안 감사 프로젝트"
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "설치 시스템 팀"
-#~ msgid "Mailing List Archives"
-#~ msgstr "메일링 리스트 모음"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "커스텀 데비안 배포판"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "데비안 멀티미디어 배포판"
+#~ msgid "Release Managers for ``stable''"
+#~ msgstr "``stable'' 릴리스 관리자"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "비영리 조직을 위한 데비안"
+#~ msgid "Security Testing Team"
+#~ msgstr "보안 테스팅 팀"
#~ msgid "Accountant"
#~ msgstr "계정"
-#~ msgid "Security Testing Team"
-#~ msgstr "보안 테스팅 팀"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "비영리 조직을 위한 데비안"
-#~ msgid "Release Managers for ``stable''"
-#~ msgstr "``stable'' 릴리스 관리자"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "데비안 멀티미디어 배포판"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "커스텀 데비안 배포판"
+#~ msgid "Mailing List Archives"
+#~ msgstr "메일링 리스트 모음"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "보안 감사 프로젝트"
#, fuzzy
-#~| msgid "Installation System Team"
-#~ msgid "Live System Team"
-#~ msgstr "설치 시스템 팀"
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "보안 팀"
diff --git a/korean/po/others.ko.po b/korean/po/others.ko.po
index fd935f42a30..4ac9a0ae158 100644
--- a/korean/po/others.ko.po
+++ b/korean/po/others.ko.po
@@ -329,26 +329,26 @@ msgstr ""
msgid "URL"
msgstr ""
-#~ msgid "Email:"
-#~ msgstr "전자우편:"
-
-#~ msgid "Mailing List Subscription"
-#~ msgstr "메일링 리스트 가입"
+#~ msgid "Languages:"
+#~ msgstr "언어:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "가입하려는 리스트를 선택하세요."
+#~ msgid "Topics:"
+#~ msgstr "주제:"
-#~ msgid "Subscription:"
-#~ msgstr "가입:"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "해지하려는 리스트를 선택하세요."
#~ msgid "Mailing List Unsubscription"
#~ msgstr "메일링 리스트 해지"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "해지하려는 리스트를 선택하세요."
+#~ msgid "Subscription:"
+#~ msgstr "가입:"
-#~ msgid "Topics:"
-#~ msgstr "주제:"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "가입하려는 리스트를 선택하세요."
-#~ msgid "Languages:"
-#~ msgstr "언어:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "메일링 리스트 가입"
+
+#~ msgid "Email:"
+#~ msgstr "전자우편:"
diff --git a/korean/po/ports.ko.po b/korean/po/ports.ko.po
index 9ea378a2500..eeef415d4dc 100644
--- a/korean/po/ports.ko.po
+++ b/korean/po/ports.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-02-02 20:57+0900\n"
"Last-Translator: 세벌 <sebuls@gmail.com>\n"
"Language-Team: debian-kr-www <debian-kr-www@lists.debian.or.kr>\n"
@@ -12,7 +13,6 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
"X-Generator: Poedit 1.8.7.1\n"
#: ../../english/ports/alpha/menu.inc:6
@@ -119,11 +119,11 @@ msgstr "PowerPC를 위한 데비안"
msgid "Debian for Sparc"
msgstr "스파크를 위한 데비안"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "libc5 기반 데비안 GNU/FreeBSD"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "데비안 GNU/FreeBSD"
#~ msgid "Date announced"
#~ msgstr "발표 날짜"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "데비안 GNU/FreeBSD"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "libc5 기반 데비안 GNU/FreeBSD"
diff --git a/korean/po/stats.ko.po b/korean/po/stats.ko.po
index 519a54cf90f..c96c2b7be69 100644
--- a/korean/po/stats.ko.po
+++ b/korean/po/stats.ko.po
@@ -31,79 +31,88 @@ msgstr "번역할 %d 바이트"
msgid "There are %d strings to translate."
msgstr "번역할 문자열 수 %d개."
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
-msgstr "이 번역은 너무 오래되었습니다"
-
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "그른 번역 버전"
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "이 번역은 너무 오래되었습니다"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "원본이 이 번역보다 새롭습니다"
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "원분이 더이상 존재하지 않음"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "조회수 N/A"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "조회"
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "번역 요약"
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "번역 안 됨"
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "오래됨"
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "번역됨"
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "최근"
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "파일"
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "바이트"
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -111,130 +120,130 @@ msgstr ""
"주의: 이 페이지 목록은 인기순으로 정렬되었습니다. 조회수를 보려면 페이지 이"
"름 위로 마우스를 이동하십시오."
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "오래된 번역"
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "파일"
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "로그"
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "번역"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "유지관리자"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "상태"
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "번역자"
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "날짜"
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "일반 페이지 번역 안 됨"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "번역 안 된 일반 페이지"
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "뉴스 아이템 번역 안 됨"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "번역 안 된 뉴스 아이템"
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "컨설턴트/사용자 페이지 번역 안 됨"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "번역 안 된 컨설턴트/사용자 페이지"
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "국제 페이지 번역 안 됨"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "번역 안 된 국제 페이지"
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "번역된 페이지(최근 정보)"
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "번역된 템플릿(PO 파일)"
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "PO 번역 통계"
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "퍼지"
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "번역 안 됨"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "전체"
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "전체:"
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "번역된 웹 페이지"
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "페이지 수 별 번역 통계"
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "언어"
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "번역"
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "번역된 웹 페이지 (크기)"
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "페이지 크기순 번역 통계"
diff --git a/korean/po/templates.ko.po b/korean/po/templates.ko.po
index 1a25cde8de1..c9d466b1f67 100644
--- a/korean/po/templates.ko.po
+++ b/korean/po/templates.ko.po
@@ -199,11 +199,11 @@ msgstr "릴리스 2.2에서"
#. your language.
#: ../../english/template/debian/footer.wml:105
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
#: ../../english/template/debian/footer.wml:108
@@ -489,6 +489,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>주의:</em> 이 번역의 원 문서가 더 이상 존재하지 않습니다."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
diff --git a/korean/po/vendors.ko.po b/korean/po/vendors.ko.po
index 07d82232b0e..436df201628 100644
--- a/korean/po/vendors.ko.po
+++ b/korean/po/vendors.ko.po
@@ -67,44 +67,44 @@ msgstr "소스"
msgid "and"
msgstr ""
-#~ msgid "Vendor:"
-#~ msgstr "판매사:"
-
-#~ msgid "Country:"
-#~ msgstr "국가"
+#~ msgid "Official CD"
+#~ msgstr "공식 CD"
-#~ msgid "Ship International:"
-#~ msgstr "국제 배송"
+#~ msgid "Official DVD"
+#~ msgstr "공식 DVD"
-#~ msgid "email:"
-#~ msgstr "전자우편"
+#~ msgid "Development Snapshot"
+#~ msgstr "개발 스냅샷"
-#~ msgid "CD Type:"
-#~ msgstr "CD 형태"
+#~ msgid "non-US included"
+#~ msgstr "non-US 포함"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD 형태"
+#~ msgid "non-free included"
+#~ msgstr "non-free 포함"
-#~ msgid "Architectures:"
-#~ msgstr "아키텍처"
+#~ msgid "contrib included"
+#~ msgstr "contrib 포함"
#~ msgid "Custom Release"
#~ msgstr "커스텀 릴리스"
-#~ msgid "contrib included"
-#~ msgstr "contrib 포함"
+#~ msgid "Architectures:"
+#~ msgstr "아키텍처"
-#~ msgid "non-free included"
-#~ msgstr "non-free 포함"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 형태"
-#~ msgid "non-US included"
-#~ msgstr "non-US 포함"
+#~ msgid "CD Type:"
+#~ msgstr "CD 형태"
-#~ msgid "Development Snapshot"
-#~ msgstr "개발 스냅샷"
+#~ msgid "email:"
+#~ msgstr "전자우편"
-#~ msgid "Official DVD"
-#~ msgstr "공식 DVD"
+#~ msgid "Ship International:"
+#~ msgstr "국제 배송"
-#~ msgid "Official CD"
-#~ msgstr "공식 CD"
+#~ msgid "Country:"
+#~ msgstr "국가"
+
+#~ msgid "Vendor:"
+#~ msgstr "판매사:"
diff --git a/lithuanian/po/blends.lt.po b/lithuanian/po/blends.lt.po
index 64b8c15bf29..b00934651af 100644
--- a/lithuanian/po/blends.lt.po
+++ b/lithuanian/po/blends.lt.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/lithuanian/po/bugs.lt.po b/lithuanian/po/bugs.lt.po
index 3e1314f3d35..d9dedb14f5a 100644
--- a/lithuanian/po/bugs.lt.po
+++ b/lithuanian/po/bugs.lt.po
@@ -157,146 +157,146 @@ msgstr "Archyvuotos"
msgid "Archived and Unarchived"
msgstr "Archyvuotos ir nearchyvuotos"
-#~ msgid "Exclude tag:"
-#~ msgstr "Pašalinti žymę:"
-
-#~ msgid "Include tag:"
-#~ msgstr "įskaityti žymę :"
+#~ msgid "Flags:"
+#~ msgstr "Vėliavos:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "aktyvios klaidos"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "rodyti sujungtos klaidos tik viena kartą"
-#~ msgid "wontfix"
-#~ msgstr "nenori ištaisyti "
+#~ msgid "no ordering by status or severity"
+#~ msgstr "netvarkyti pagal statusą arba griežtumą"
-#~ msgid "upstream"
-#~ msgstr "prieš srovę"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "Nerodyti lenteles turinį viršutiniame kolontitule"
-#~ msgid "unreproducible"
-#~ msgstr "neproduktyvus"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "Nerodyti statistiką apatiniame kolontitule"
-#~ msgid "security"
-#~ msgstr "saugumas"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "lopas"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "daugiau informacijos"
+#~ msgid "Package version:"
+#~ msgstr "Paketo versiją:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Distribucija:"
-#~ msgid "help"
-#~ msgstr "padėti"
+#~ msgid "bugs"
+#~ msgstr "klaidos"
-#~ msgid "fixed-upstream"
-#~ msgstr "Pataisytas prieš srovę"
+#~ msgid "open"
+#~ msgstr "atviras"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "pataisytas eksperimentinėje"
+#~ msgid "forwarded"
+#~ msgstr "išsiųstas"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "laukimas"
-#~ msgid "confirmed"
-#~ msgstr "patvirtintas"
+#~ msgid "fixed"
+#~ msgstr "fiksuotas"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "padarytas"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "Include status:"
+#~ msgstr "įskaityti statusą"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "Exclude status:"
+#~ msgstr "Pašalinti statusą:"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "critical"
+#~ msgstr "kritiškas"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "grave"
+#~ msgstr "rimtas"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "serious"
+#~ msgstr "rimtas"
-#~ msgid "Exclude severity:"
-#~ msgstr "Pašalinti griežtumą:"
+#~ msgid "important"
+#~ msgstr "svarbus"
-#~ msgid "Include severity:"
-#~ msgstr "įskaityti griežtumą:"
+#~ msgid "minor"
+#~ msgstr "mažesnis"
#~ msgid "wishlist"
#~ msgstr "pageidavimo sąrašas "
-#~ msgid "minor"
-#~ msgstr "mažesnis"
+#~ msgid "Include severity:"
+#~ msgstr "įskaityti griežtumą:"
-#~ msgid "important"
-#~ msgstr "svarbus"
+#~ msgid "Exclude severity:"
+#~ msgstr "Pašalinti griežtumą:"
-#~ msgid "serious"
-#~ msgstr "rimtas"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "grave"
-#~ msgstr "rimtas"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "critical"
-#~ msgstr "kritiškas"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Pašalinti statusą:"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "Include status:"
-#~ msgstr "įskaityti statusą"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "done"
-#~ msgstr "padarytas"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "fiksuotas"
+#~ msgid "confirmed"
+#~ msgstr "patvirtintas"
-#~ msgid "pending"
-#~ msgstr "laukimas"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "išsiųstas"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "pataisytas eksperimentinėje"
-#~ msgid "open"
-#~ msgstr "atviras"
+#~ msgid "fixed-upstream"
+#~ msgstr "Pataisytas prieš srovę"
-#~ msgid "bugs"
-#~ msgstr "klaidos"
+#~ msgid "help"
+#~ msgstr "padėti"
-#~ msgid "Distribution:"
-#~ msgstr "Distribucija:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Paketo versiją:"
+#~ msgid "moreinfo"
+#~ msgstr "daugiau informacijos"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "lopas"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "saugumas"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "Nerodyti statistiką apatiniame kolontitule"
+#~ msgid "unreproducible"
+#~ msgstr "neproduktyvus"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "Nerodyti lenteles turinį viršutiniame kolontitule"
+#~ msgid "upstream"
+#~ msgstr "prieš srovę"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "netvarkyti pagal statusą arba griežtumą"
+#~ msgid "wontfix"
+#~ msgstr "nenori ištaisyti "
-#~ msgid "display merged bugs only once"
-#~ msgstr "rodyti sujungtos klaidos tik viena kartą"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "aktyvios klaidos"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Vėliavos:"
+#~ msgid "Include tag:"
+#~ msgstr "įskaityti žymę :"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Pašalinti žymę:"
diff --git a/lithuanian/po/distrib.lt.po b/lithuanian/po/distrib.lt.po
index 3840ac53307..eae465d7394 100644
--- a/lithuanian/po/distrib.lt.po
+++ b/lithuanian/po/distrib.lt.po
@@ -210,38 +210,38 @@ msgstr ""
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
-
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paketai kurie turi failų arba direktorijų pavadinimus kaip šitas"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "all files in this package"
+#~ msgstr "visi failai šitame pakete"
-#~ msgid "Search case sensitive"
-#~ msgstr "Leisti ieškoti skiriant raidžių dydį"
+#~ msgid "Case sensitive"
+#~ msgstr "Skirti raidžių dydį"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Leisti ieškoti pažodžiui"
+#~ msgid "no"
+#~ msgstr "ne"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "yes"
+#~ msgstr "taip"
#~ msgid "MIPS"
#~ msgstr "MIPS"
-#~ msgid "yes"
-#~ msgstr "taip"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "no"
-#~ msgstr "ne"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Leisti ieškoti pažodžiui"
-#~ msgid "Case sensitive"
-#~ msgstr "Skirti raidžių dydį"
+#~ msgid "Search case sensitive"
+#~ msgstr "Leisti ieškoti skiriant raidžių dydį"
-#~ msgid "all files in this package"
-#~ msgstr "visi failai šitame pakete"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "paketai kurie turi failų arba direktorijų pavadinimus kaip šitas"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
+
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/lithuanian/po/doc.lt.po b/lithuanian/po/doc.lt.po
index a01330dbb9e..fff26d8c588 100644
--- a/lithuanian/po/doc.lt.po
+++ b/lithuanian/po/doc.lt.po
@@ -28,8 +28,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -53,31 +53,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -89,7 +65,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -101,7 +77,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -109,6 +85,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autorius:"
@@ -161,10 +153,10 @@ msgstr "(versija <get-var version />)"
msgid "plain text"
msgstr "grynas tekstas"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -189,12 +181,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -227,12 +213,12 @@ msgstr ""
msgid "PDF"
msgstr ""
+#~ msgid "Language:"
+#~ msgstr "Kalba:"
+
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "Naudokite <a href=\"cvs\">SVN</a> kad parsisiųstumėte SGML teksto šaltinį "
#~ "<get-var ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Kalba:"
diff --git a/lithuanian/po/mailinglists.lt.po b/lithuanian/po/mailinglists.lt.po
index ef9ccbf418c..64b1952e83f 100644
--- a/lithuanian/po/mailinglists.lt.po
+++ b/lithuanian/po/mailinglists.lt.po
@@ -125,9 +125,9 @@ msgstr "atviras"
msgid "closed"
msgstr "uždaras"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Prašome pasirinkti į kurias konferencijas norite prisiregistruoti:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Prašome pasirinkti konferencijas iš kurių jūs norite išsiregistruoti:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Prašome pasirinkti į kurias konferencijas norite prisiregistruoti:"
diff --git a/lithuanian/po/organization.lt.po b/lithuanian/po/organization.lt.po
index e44b666a2ee..affd1aabd94 100644
--- a/lithuanian/po/organization.lt.po
+++ b/lithuanian/po/organization.lt.po
@@ -74,24 +74,24 @@ msgid "Officers"
msgstr "Pareigūnai"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribucija"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Viešieji_ryšiai"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Palaikymas ir Infrastruktūra"
@@ -108,219 +108,219 @@ msgstr "Lyderis"
msgid "Technical Committee"
msgstr "Techninis Komitetas"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekretorius"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Plėtojimo Projektai"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP Archyvai"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Meistras"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP Asistentai"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Individualūs paketai"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Vadovavimas Išleidimui"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Išleidimo komanda"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Kokybės Užtikrinimas"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Įdiegimo sistemos komanda"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Išleidimo pastabos"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD atvaizdai"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produkcija"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testuojama"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Palaikymas ir Infrastruktūra"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Buildd Administracija"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Reikalaujantis darbo ir Laukiamas paketų sąrašas"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Live sistemos komanda"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Pernešimai"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Specialios konfigūracijos"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Nešiojami kompiuteriai"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Saugos siena"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Įdiegtos sistemos"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Ryšiai su žiniasklaida"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Tinkalalapiai "
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Debian Planeta"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Moterys Debian projekte"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Įvykiai"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Techninis Komitetas"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Partnerio Programa"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Kompiuterinės įrangos aukojimo koordinatorius"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Vartotojų palaikymas"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Klaidų stebėjimo sistema"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Pašto konferencijų administracija ir Pašto konferencijų archyvai"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Naujo plėtojo registracinis stalas"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debian sąskaitos valdytojai"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Raktinės valdytojai (PGP ir GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Saugumo komanda"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Konsultantų puslapis"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "CD Pardavėjų puslapis"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Politika"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Sistemos administracija"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -328,7 +328,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:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -338,94 +338,112 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP plėtotojų direktorijos administratorius"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Veidrodžiai"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS prižiūrėtojas"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Paketų stebėjimo sistema"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Revizorius"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth administratoriai"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth administratoriai"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian vaikams nuo 1 iki 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian medicinos praktikai ir jų tyrimams"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian švietimui"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian teisėje"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian neįgaliems žmonėms"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian medicinos praktikai ir jų tyrimams"
-#~ msgid "Publicity"
-#~ msgstr "Viešieji_ryšiai"
-
+#: ../../english/intro/organization.data:492
#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian plėtotųjų raktinės komanda"
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian švietimui"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Papildomos Debian distribucijos"
+#~ msgid "Testing Security Team"
+#~ msgstr "Testing Saugumo komanda"
-#~| msgid "Release Manager for ``stable''"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "``stable'' Išleidimo komanda"
+#~ msgid "Security Audit Project"
+#~ msgstr "Saugumo revizijos projektas"
-#~ msgid "Vendors"
-#~ msgstr "Pardavėjai"
+#~ msgid "Release Assistants"
+#~ msgstr "Išleidimo Asistentai"
-#~ msgid "Handhelds"
-#~ msgstr "Kišeniniai kompiuteriai"
+#~ msgid "APT Team"
+#~ msgstr "APT komanda"
-#~| msgid "Security Testing Team"
-#~ msgid "Marketing Team"
-#~ msgstr "Prekybos Komanda"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Pašto konferencijos archyvai"
+
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux Verslui"
+
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian Multimedijos Distributyvas"
#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
#~ msgstr ""
-#~ "Administratoriai, atsakingi už tam tikra architektūrą gali būti "
-#~ "pasiekiami <genericemail arch@buildd.debian.org>, pavyzdžiui "
-#~ "<genericemail i386@buildd.debian.org>."
+#~ "Tai dar ne oficialus vidinis Debian projektas, bet jis paskelbė siekti "
+#~ "integraciją."
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian pelno nesiekiančioms organizacijoms"
+
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Universali operacinė sistema jūsų darbastalyje"
+
+#~ msgid "Accountant"
+#~ msgstr "Sąskaitininkas"
+
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Rakto pasirašymo koordinatorius"
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -437,42 +455,42 @@ msgstr "Debian medicinos praktikai ir jų tyrimams"
#~ "architektūrą ir distributyvą kad pažiūrėtumėte galimus buildd ir jų "
#~ "administratorius."
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Rakto pasirašymo koordinatorius"
-
-#~ msgid "Accountant"
-#~ msgstr "Sąskaitininkas"
-
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Universali operacinė sistema jūsų darbastalyje"
-
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian pelno nesiekiančioms organizacijoms"
-
#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
#~ msgstr ""
-#~ "Tai dar ne oficialus vidinis Debian projektas, bet jis paskelbė siekti "
-#~ "integraciją."
+#~ "Administratoriai, atsakingi už tam tikra architektūrą gali būti "
+#~ "pasiekiami <genericemail arch@buildd.debian.org>, pavyzdžiui "
+#~ "<genericemail i386@buildd.debian.org>."
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian Multimedijos Distributyvas"
+#~| msgid "Security Testing Team"
+#~ msgid "Marketing Team"
+#~ msgstr "Prekybos Komanda"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux Verslui"
+#~ msgid "Handhelds"
+#~ msgstr "Kišeniniai kompiuteriai"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Pašto konferencijos archyvai"
+#~ msgid "Vendors"
+#~ msgstr "Pardavėjai"
-#~ msgid "APT Team"
-#~ msgstr "APT komanda"
+#~| msgid "Release Manager for ``stable''"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "``stable'' Išleidimo komanda"
-#~ msgid "Release Assistants"
-#~ msgstr "Išleidimo Asistentai"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Papildomos Debian distribucijos"
-#~ msgid "Security Audit Project"
-#~ msgstr "Saugumo revizijos projektas"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian plėtotųjų raktinės komanda"
-#~ msgid "Testing Security Team"
-#~ msgstr "Testing Saugumo komanda"
+#~ msgid "Publicity"
+#~ msgstr "Viešieji_ryšiai"
+
+#~ msgid "Auditor"
+#~ msgstr "Revizorius"
+
+#~ msgid "Live System Team"
+#~ msgstr "Live sistemos komanda"
diff --git a/lithuanian/po/others.lt.po b/lithuanian/po/others.lt.po
index 19d20e289ad..a49e0117f68 100644
--- a/lithuanian/po/others.lt.po
+++ b/lithuanian/po/others.lt.po
@@ -335,17 +335,17 @@ msgstr "Versija"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "Kur:"
+#~ msgid "Wanted:"
+#~ msgstr "Ieškoma:"
-#~ msgid "Specifications:"
-#~ msgstr "Specifikacijos:"
+#~ msgid "Who:"
+#~ msgstr "Kas:"
#~ msgid "Architecture:"
#~ msgstr "Architektūra:"
-#~ msgid "Who:"
-#~ msgstr "Kas:"
+#~ msgid "Specifications:"
+#~ msgstr "Specifikacijos:"
-#~ msgid "Wanted:"
-#~ msgstr "Ieškoma:"
+#~ msgid "Where:"
+#~ msgstr "Kur:"
diff --git a/lithuanian/po/partners.lt.po b/lithuanian/po/partners.lt.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/lithuanian/po/partners.lt.po
+++ b/lithuanian/po/partners.lt.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/lithuanian/po/ports.lt.po b/lithuanian/po/ports.lt.po
index 2bc2ab2c498..98f53001b34 100644
--- a/lithuanian/po/ports.lt.po
+++ b/lithuanian/po/ports.lt.po
@@ -115,65 +115,68 @@ msgstr "Debian PowerPC"
msgid "Debian for Sparc"
msgstr "Debian for Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian nešiojamiems kompiuteriams"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPS"
-#~ msgid "Main"
-#~ msgstr "Pagrindinis"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgid "Vendor/Name"
-#~ msgstr "Pardavėjai/Pavadinimas"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Date announced"
-#~ msgstr "Paskelbimo datą"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 cache on die"
-#~ msgid "Clock"
-#~ msgstr "Clock"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bit external bus, external L2 cache"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bit external bus"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bit external bus"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "Specials"
-#~ msgstr "Specialūs"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "No FPU (R2010), external caches"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "No FPU (R3010)"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "External L1 cache"
-#~ msgstr "External L1 cache"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "Multiple chip CPU"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -182,65 +185,62 @@ msgstr "Debian for Sparc"
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
#~ "I2C, Watchdog"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "Multiple chip CPU"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgid "External L1 cache"
+#~ msgstr "External L1 cache"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "No FPU (R3010)"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "No FPU (R2010), external caches"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgid "Specials"
+#~ msgstr "Specialūs"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bit external bus"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bit external bus"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bit external bus, external L2 cache"
+#~ msgid "Clock"
+#~ msgstr "Clock"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 cache on die"
+#~ msgid "Date announced"
+#~ msgstr "Paskelbimo datą"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Vendor/Name"
+#~ msgstr "Pardavėjai/Pavadinimas"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
+#~ msgid "Main"
+#~ msgstr "Pagrindinis"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian nešiojamiems kompiuteriams"
diff --git a/lithuanian/po/stats.lt.po b/lithuanian/po/stats.lt.po
index c92df9c4fc7..da075b76138 100644
--- a/lithuanian/po/stats.lt.po
+++ b/lithuanian/po/stats.lt.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/lithuanian/po/templates.lt.po b/lithuanian/po/templates.lt.po
index 46004d7a93e..7da111e32f4 100644
--- a/lithuanian/po/templates.lt.po
+++ b/lithuanian/po/templates.lt.po
@@ -212,11 +212,11 @@ msgstr "2.2 versijoje"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Problemas, susijusias su tinklalapiu siųskite el. paštu <a href=\"mailto:"
"debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. Norint gauti "
@@ -520,6 +520,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Pastaba:</em> Šio vertimo originalus dokumentas nebeegzistuoja."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -528,229 +532,153 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Grįžti į <a href=\"./\">Kas naudoja Debian?</a>."
-#~ msgid "More information"
-#~ msgstr "Daugiau informacijos"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Ateinančios atrakcijos"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "nuoroda greičiausiai nebe egzistuoja"
-
-#~ msgid "When"
-#~ msgstr "Kada"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Aplankykite puslapio rėmėją"
-#~ msgid "Where"
-#~ msgstr "Kur"
+#~ msgid "Select a server near you"
+#~ msgstr "Pasirinkite tarnybinę stotį, esančią arčiausiai jūsų"
-#~ msgid "More Info"
-#~ msgstr "Daugiau informacijos"
+#~ msgid "More information:"
+#~ msgstr "Daugiau informacijos:"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debian dalyvavimas"
+#~ msgid "Taken by:"
+#~ msgstr "Perimta:"
-#~ msgid "Main Coordinator"
-#~ msgstr "Pagrindinis koordinatorius"
+#~ msgid "Nobody"
+#~ msgstr "Niekieno"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekto</th><th>koordinatorius</th>"
+#~ msgid "Rating:"
+#~ msgstr "Reitingas:"
-#~ msgid "Related Links"
-#~ msgstr "Susijusios nuorodos"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsultantų sąraÅ”as"
-#~ msgid "Latest News"
-#~ msgstr "Paskutinės naujienos"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "<a href=\"m4_HOME/\">Debian Projekto tinklapis</a>."
+#~ msgid "Download with Jigdo"
+#~ msgstr "parsisiųsti su jigdo"
#, fuzzy
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
-#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
-#~ "konferencijoje. "
-
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "<a href=\"../../\">Ankstesnės naujienos</a>."
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "parsisiųsti http/ftp protokolais"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "Network Install"
+#~ msgstr "ÄÆdiegti per tinklą"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "DUK"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "kita"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "DUK"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "kita"
#, fuzzy
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
-#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
-#~ "konferencijoje. "
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "kita"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD komanda"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian kompakte"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "DUK"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http/ftp"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Daugiau informacijos"
+#~ msgid "buy"
+#~ msgstr "pirk"
+
+#~ msgid "net_install"
+#~ msgstr "ÄÆdiegimas per tinklą"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "kita"
#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Paliesti paketai"
+#~ msgid "Nominations"
+#~ msgstr "Parama"
#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "kita"
+#~ msgid "Debate"
+#~ msgstr "Debian CD komanda"
#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Daugiau informacijos"
+#~ msgid "Proposer"
+#~ msgstr "siūloma"
#, fuzzy
-#~ msgid "Discussion"
+#~ msgid "Minimum Discussion"
#~ msgstr "Vyksta&nbsp;diskusijos"
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "Nėra"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Laukia&nbsp;sponsorių"
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (nuoroda neegzistuoja)"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Vyksta&nbsp;diskusijos"
-#~ msgid "buy pre-made images"
-#~ msgstr "nusipirkti paruoŔtas cd kopijas"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Atviras&nbsp;balsavimas"
-#~ msgid "download with pik"
-#~ msgstr "parsisiųsti su pik"
+#~ msgid "Decided"
+#~ msgstr "Nuspręsta"
-#~ msgid "pik"
-#~ msgstr "P.I.K"
+#~ msgid "Withdrawn"
+#~ msgstr "AtŔaukta"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Norėdami su mumis susisiekti aplankykite <a href=\"m4_HOME/contact"
-#~ "\">kontaktų puslapÄÆ</a>."
+#~ msgid "Other"
+#~ msgstr "Kita"
-#~ msgid "discussed"
-#~ msgstr "aptariama"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Pradinis&nbsp;balsavimo&nbsp;puslapis"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debian saugumo patarimas"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kaip"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debian saugumo patarimai"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Pateikti&nbsp;siūlymą"
-#~ msgid "Vulnerable"
-#~ msgstr "Pažeidžiama"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Keisti&nbsp;siūlymą"
-#~ msgid "Fixed in"
-#~ msgstr "Pataisyta"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sekti&nbsp;siūlymą"
-#~ msgid "Source:"
-#~ msgstr "IÅ eities tekstai"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Skaityti&nbsp;rezultatą"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Komponenetas nepriklausantis nuo architektūros"
+#~ msgid "Vote"
+#~ msgstr "Balsuoti"
#, fuzzy
#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
-#~ msgstr ""
-#~ "Pateiktų bylų kontrolinės sumos yra <a href=\"%attributes"
-#~ "\">originaliame praneŔime</a>."
-
-#~ msgid "No other external database security references currently available."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Jokių iÅ”orinių saugumo duomenų bazių Å”altinių Å”iuo metų nėra"
-
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERT pažeidimai, patarimai ir atsitikimų pasakojimai:"
-
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "Bugtraq duomenų bazėje (pas SecurityFocus):"
-
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "Mitre CVE žodyne:"
-
-#~ msgid "Security database references"
-#~ msgstr "Saugumo duomenų bazės sąsajos"
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
#~ "Debian Savaitines Naujienas redaguoja <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary ir Tollef Fog Heen</a>."
+#~ "\">Joe 'Zonker' Brockmeier ir Martin 'Joey' Schulze</a>."
#~ msgid ""
#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
@@ -759,150 +687,226 @@ msgstr "Grįžti į <a href=\"./\">Kas naudoja Debian?</a>."
#~ "Debian Savaitines Naujienas redaguoja <a href=\"mailto:dwn@debian.org"
#~ "\">Joe 'Zonker' Brockmeier ir Martin 'Joey' Schulze</a>."
-#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#~ msgstr ""
#~ "Debian Savaitines Naujienas redaguoja <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier ir Martin 'Joey' Schulze</a>."
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary ir Tollef Fog Heen</a>."
+
+#~ msgid "Security database references"
+#~ msgstr "Saugumo duomenų bazės sąsajos"
+
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "Mitre CVE žodyne:"
+
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "Bugtraq duomenų bazėje (pas SecurityFocus):"
+
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERT pažeidimai, patarimai ir atsitikimų pasakojimai:"
+
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Jokių iÅ”orinių saugumo duomenų bazių Å”altinių Å”iuo metų nėra"
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
-
-#~ msgid "Vote"
-#~ msgstr "Balsuoti"
+#~ "Pateiktų bylų kontrolinės sumos yra <a href=\"%attributes"
+#~ "\">originaliame praneŔime</a>."
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Skaityti&nbsp;rezultatą"
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Komponenetas nepriklausantis nuo architektūros"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Sekti&nbsp;siūlymą"
+#~ msgid "Source:"
+#~ msgstr "IÅ eities tekstai"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Keisti&nbsp;siūlymą"
+#~ msgid "Fixed in"
+#~ msgstr "Pataisyta"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Pateikti&nbsp;siūlymą"
+#~ msgid "Vulnerable"
+#~ msgstr "Pažeidžiama"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kaip"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debian saugumo patarimai"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Pradinis&nbsp;balsavimo&nbsp;puslapis"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debian saugumo patarimas"
-#~ msgid "Other"
-#~ msgstr "Kita"
+#~ msgid "discussed"
+#~ msgstr "aptariama"
-#~ msgid "Withdrawn"
-#~ msgstr "AtŔaukta"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Norėdami su mumis susisiekti aplankykite <a href=\"m4_HOME/contact"
+#~ "\">kontaktų puslapÄÆ</a>."
-#~ msgid "Decided"
-#~ msgstr "Nuspręsta"
+#~ msgid "pik"
+#~ msgstr "P.I.K"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Atviras&nbsp;balsavimas"
+#~ msgid "download with pik"
+#~ msgstr "parsisiųsti su pik"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Vyksta&nbsp;diskusijos"
+#~ msgid "buy pre-made images"
+#~ msgstr "nusipirkti paruoŔtas cd kopijas"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Laukia&nbsp;sponsorių"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (nuoroda neegzistuoja)"
#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Vyksta&nbsp;diskusijos"
+#~ msgid "non-free"
+#~ msgstr "Nėra"
#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "siūloma"
+#~ msgid "Discussion"
+#~ msgstr "Vyksta&nbsp;diskusijos"
#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debian CD komanda"
+#~ msgid "License Information"
+#~ msgstr "Daugiau informacijos"
#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Parama"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
#~ msgstr "kita"
-#~ msgid "net_install"
-#~ msgstr "ÄÆdiegimas per tinklą"
+#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "Paliesti paketai"
-#~ msgid "buy"
-#~ msgstr "pirk"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "Daugiau informacijos"
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "DUK"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian kompakte"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD komanda"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "kita"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
+#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
+#~ "konferencijoje. "
#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "kita"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "DUK"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "kita"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "DUK"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "ÄÆdiegti per tinklą"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
+
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "<a href=\"../../\">Ankstesnės naujienos</a>."
#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "parsisiųsti http/ftp protokolais"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
+#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
+#~ "konferencijoje. "
#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "parsisiųsti su jigdo"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "<a href=\"m4_HOME/\">Debian Projekto tinklapis</a>."
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
+#~ msgid "Latest News"
+#~ msgstr "Paskutinės naujienos"
-#~ msgid "List of Consultants"
-#~ msgstr "Konsultantų sąraÅ”as"
+#~ msgid "Related Links"
+#~ msgstr "Susijusios nuorodos"
-#~ msgid "Rating:"
-#~ msgstr "Reitingas:"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekto</th><th>koordinatorius</th>"
-#~ msgid "Nobody"
-#~ msgstr "Niekieno"
+#~ msgid "Main Coordinator"
+#~ msgstr "Pagrindinis koordinatorius"
-#~ msgid "Taken by:"
-#~ msgstr "Perimta:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debian dalyvavimas"
-#~ msgid "More information:"
-#~ msgstr "Daugiau informacijos:"
+#~ msgid "More Info"
+#~ msgstr "Daugiau informacijos"
-#~ msgid "Select a server near you"
-#~ msgstr "Pasirinkite tarnybinę stotį, esančią arčiausiai jūsų"
+#~ msgid "Where"
+#~ msgstr "Kur"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Aplankykite puslapio rėmėją"
+#~ msgid "When"
+#~ msgstr "Kada"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "nuoroda greičiausiai nebe egzistuoja"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Ateinančios atrakcijos"
+
+#~ msgid "More information"
+#~ msgstr "Daugiau informacijos"
diff --git a/lithuanian/po/vendors.lt.po b/lithuanian/po/vendors.lt.po
index ef50f819915..864b4134ac4 100644
--- a/lithuanian/po/vendors.lt.po
+++ b/lithuanian/po/vendors.lt.po
@@ -66,74 +66,74 @@ msgstr "išeities tekstas"
msgid "and"
msgstr "ir"
-#~ msgid "updated monthly"
-#~ msgstr "Atnaujinama kas menes"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "Atnaujinama dukart per savaitę"
+#~ msgid "Vendor:"
+#~ msgstr "Pardavėjas:"
-#~ msgid "updated weekly"
-#~ msgstr "Atnaujinama kas savaitę"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL Debian Tinklapiui:"
-#~ msgid "reseller"
-#~ msgstr "perpardavinėtojas"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Leidžiama įnešti į Debian:"
-#~ msgid "reseller of $var"
-#~ msgstr "$var perpardavinėtojas "
+#~ msgid "Country:"
+#~ msgstr "Šalis:"
-#~ msgid "Custom Release"
-#~ msgstr "Papildoma išleista versiją"
+#~ msgid "Ship International:"
+#~ msgstr "Tarptautinės Siuntos:"
-#~ msgid "vendor additions"
-#~ msgstr "pardavėjų priedai"
+#~ msgid "email:"
+#~ msgstr "el. paštas:"
-#~ msgid "contrib included"
-#~ msgstr "contrib įjungta"
+#~ msgid "CD Type:"
+#~ msgstr "CD Tipas:"
-#~ msgid "non-free included"
-#~ msgstr "non-free įjungta"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD Tipas:"
-#~ msgid "non-US included"
-#~ msgstr "non-US įjungta"
+#~ msgid "Architectures:"
+#~ msgstr "Architektūros"
-#~ msgid "Multiple Distribution"
-#~ msgstr "sudėtinis distributyvas"
+#~ msgid "Official CD"
+#~ msgstr "Oficialus CD"
-#~ msgid "Vendor Release"
-#~ msgstr "Gamintojo Išleista Versiją"
+#~ msgid "Official DVD"
+#~ msgstr "Oficialus DVD"
#~ msgid "Development Snapshot"
#~ msgstr "Kūrimo momentinė nuotrauka"
-#~ msgid "Official DVD"
-#~ msgstr "Oficialus DVD"
+#~ msgid "Vendor Release"
+#~ msgstr "Gamintojo Išleista Versiją"
-#~ msgid "Official CD"
-#~ msgstr "Oficialus CD"
+#~ msgid "Multiple Distribution"
+#~ msgstr "sudėtinis distributyvas"
-#~ msgid "Architectures:"
-#~ msgstr "Architektūros"
+#~ msgid "non-US included"
+#~ msgstr "non-US įjungta"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD Tipas:"
+#~ msgid "non-free included"
+#~ msgstr "non-free įjungta"
-#~ msgid "CD Type:"
-#~ msgstr "CD Tipas:"
+#~ msgid "contrib included"
+#~ msgstr "contrib įjungta"
-#~ msgid "email:"
-#~ msgstr "el. paštas:"
+#~ msgid "vendor additions"
+#~ msgstr "pardavėjų priedai"
-#~ msgid "Ship International:"
-#~ msgstr "Tarptautinės Siuntos:"
+#~ msgid "Custom Release"
+#~ msgstr "Papildoma išleista versiją"
-#~ msgid "Country:"
-#~ msgstr "Šalis:"
+#~ msgid "reseller of $var"
+#~ msgstr "$var perpardavinėtojas "
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Leidžiama įnešti į Debian:"
+#~ msgid "reseller"
+#~ msgstr "perpardavinėtojas"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL Debian Tinklapiui:"
+#~ msgid "updated weekly"
+#~ msgstr "Atnaujinama kas savaitę"
-#~ msgid "Vendor:"
-#~ msgstr "Pardavėjas:"
+#~ msgid "updated twice weekly"
+#~ msgstr "Atnaujinama dukart per savaitę"
+
+#~ msgid "updated monthly"
+#~ msgstr "Atnaujinama kas menes"
diff --git a/norwegian/po/blends.nb.po b/norwegian/po/blends.nb.po
index 64b8c15bf29..b00934651af 100644
--- a/norwegian/po/blends.nb.po
+++ b/norwegian/po/blends.nb.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/norwegian/po/bugs.nb.po b/norwegian/po/bugs.nb.po
index 55a69bcc1b0..11ef3e9bfd3 100644
--- a/norwegian/po/bugs.nb.po
+++ b/norwegian/po/bugs.nb.po
@@ -155,114 +155,114 @@ msgstr "Arkivert"
msgid "Archived and Unarchived"
msgstr "Arkivert og ikke arkivert"
-#~ msgid "Flags:"
-#~ msgstr "Flagg:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Ekskludér merkelapp:"
-#~ msgid "active bugs"
-#~ msgstr "aktive feil"
+#~ msgid "Include tag:"
+#~ msgstr "Inkludér merkelapp:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "vis kombinerte feil kun én gang"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/alvorlighetsgrad"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
+#~ msgid "wontfix"
+#~ msgstr "fikser-ikke"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "vis ikke statistikk i sidefot"
+#~ msgid "upstream"
+#~ msgstr "oppstrøms"
-#~ msgid "bugs"
-#~ msgstr "feil"
+# Sjekkes!
+#~ msgid "unreproducible"
+#~ msgstr "ikkereproduserbart"
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "security"
+#~ msgstr "sikkerhet"
-#~ msgid "forwarded"
-#~ msgstr "videresendt"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "pending"
-#~ msgstr "på gang"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
-#~ msgid "fixed"
-#~ msgstr "rettet"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "done"
-#~ msgstr "ferdigt"
+#~ msgid "help"
+#~ msgstr "hjelp"
-#~ msgid "Include status:"
-#~ msgstr "Inkludér status:"
+#~ msgid "fixed-upstream"
+#~ msgstr "rettet-oppstrøms"
-#~ msgid "Exclude status:"
-#~ msgstr "Ekskludér status:"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "rettet-i-experimental"
-#~ msgid "critical"
-#~ msgstr "kritisk"
+#~ msgid "confirmed"
+#~ msgstr "bekreftet"
-#~ msgid "grave"
-#~ msgstr "graverende"
+#~ msgid "Exclude severity:"
+#~ msgstr "Ekskludér alvorlighetsgrad:"
-#~ msgid "serious"
-#~ msgstr "alvorlig"
+#~ msgid "Include severity:"
+#~ msgstr "Inkludér alvorlighetsgrad:"
-#~ msgid "important"
-#~ msgstr "viktig"
+#~ msgid "wishlist"
+#~ msgstr "ønske"
#~ msgid "minor"
#~ msgstr "liten"
-#~ msgid "wishlist"
-#~ msgstr "ønske"
+#~ msgid "important"
+#~ msgstr "viktig"
-#~ msgid "Include severity:"
-#~ msgstr "Inkludér alvorlighetsgrad:"
+#~ msgid "serious"
+#~ msgstr "alvorlig"
-#~ msgid "Exclude severity:"
-#~ msgstr "Ekskludér alvorlighetsgrad:"
+#~ msgid "grave"
+#~ msgstr "graverende"
-#~ msgid "confirmed"
-#~ msgstr "bekreftet"
+#~ msgid "critical"
+#~ msgstr "kritisk"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "rettet-i-experimental"
+#~ msgid "Exclude status:"
+#~ msgstr "Ekskludér status:"
-#~ msgid "fixed-upstream"
-#~ msgstr "rettet-oppstrøms"
+#~ msgid "Include status:"
+#~ msgstr "Inkludér status:"
-#~ msgid "help"
-#~ msgstr "hjelp"
+#~ msgid "done"
+#~ msgstr "ferdigt"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "fixed"
+#~ msgstr "rettet"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "pending"
+#~ msgstr "på gang"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "forwarded"
+#~ msgstr "videresendt"
-#~ msgid "security"
-#~ msgstr "sikkerhet"
+#~ msgid "open"
+#~ msgstr "åpen"
-# Sjekkes!
-#~ msgid "unreproducible"
-#~ msgstr "ikkereproduserbart"
+#~ msgid "bugs"
+#~ msgstr "feil"
-#~ msgid "upstream"
-#~ msgstr "oppstrøms"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "vis ikke statistikk i sidefot"
-#~ msgid "wontfix"
-#~ msgstr "fikser-ikke"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/alvorlighetsgrad"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "display merged bugs only once"
+#~ msgstr "vis kombinerte feil kun én gang"
-#~ msgid "Include tag:"
-#~ msgstr "Inkludér merkelapp:"
+#~ msgid "active bugs"
+#~ msgstr "aktive feil"
-#~ msgid "Exclude tag:"
-#~ msgstr "Ekskludér merkelapp:"
+#~ msgid "Flags:"
+#~ msgstr "Flagg:"
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index 8fcf0c1a168..c136642c26e 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -425,8 +425,8 @@ msgstr "Sørafrika"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoslavia"
-
#~ msgid "Great Britain"
#~ msgstr "Storbritania"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavia"
diff --git a/norwegian/po/distrib.nb.po b/norwegian/po/distrib.nb.po
index a28882ec06a..de087ee4b7c 100644
--- a/norwegian/po/distrib.nb.po
+++ b/norwegian/po/distrib.nb.po
@@ -206,24 +206,24 @@ msgstr ""
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~| msgid "Intel x86"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~| msgid "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/norwegian/po/doc.nb.po b/norwegian/po/doc.nb.po
index 8f263716e0e..feeb09dafde 100644
--- a/norwegian/po/doc.nb.po
+++ b/norwegian/po/doc.nb.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -87,7 +63,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -107,6 +83,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Forfatter:"
@@ -159,10 +151,10 @@ msgstr "(versjon <get-var version />)"
msgid "plain text"
msgstr "ren tekst"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -187,12 +179,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -223,12 +209,12 @@ msgstr ""
msgid "PDF"
msgstr ""
+#~ msgid "Language:"
+#~ msgstr "Språk:"
+
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "Bruk <a href=\"cvs\">SVN</a> for å hente SGML-kildeteksten for <get-var "
#~ "ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Språk:"
diff --git a/norwegian/po/mailinglists.nb.po b/norwegian/po/mailinglists.nb.po
index a805517f8c1..5ad79fdd49f 100644
--- a/norwegian/po/mailinglists.nb.po
+++ b/norwegian/po/mailinglists.nb.po
@@ -122,8 +122,8 @@ msgstr "åpen"
msgid "closed"
msgstr "lukket"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Velg listene du vil abonnere på:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Velg listene du vil si opp abonnementet på:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Velg listene du vil abonnere på:"
diff --git a/norwegian/po/organization.nb.po b/norwegian/po/organization.nb.po
index f5d2fce4d6d..273507c1cf4 100644
--- a/norwegian/po/organization.nb.po
+++ b/norwegian/po/organization.nb.po
@@ -71,24 +71,24 @@ msgid "Officers"
msgstr "Styremedlemmer"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribusjon"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publisitet"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Støtte og infrastruktur"
@@ -105,211 +105,211 @@ msgstr "Leder"
msgid "Technical Committee"
msgstr "Teknisk komité"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekretær"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Utviklingsprosjekter"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP-arkiv"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP-ansvarlige"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP-assistenter"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Individuelle pakker"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Utgavekoordinering"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Utgiverlag"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Kvalitetskontroll"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Installasjonsystems-gruppen"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Utgivelsesnotater"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD-avtrykk"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produksjon"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infrastruktur for automatisk bygging"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Buildd-administrasjon"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentasjon"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "List over pakker som trenger arbeid og mulige pakker"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Gruppen for «live»-system"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Porteringer"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Spesielle systemer"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Bærbare"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Brannvegger"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Innebygde system"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Pressekontakt"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Nettsider"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Debian kvinneprosjekt"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Begivenheter"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Teknisk komité"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Partnerprogram"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Koordinering av maskinvaredonasjon"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Brukerstøtte"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Feilrapportsystem"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Postlisteadministrasjon og -arkiv"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Resepsjon for nye medlemmer"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debian kontoforvaltere"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Nøkkelring-koordinatore (PGP og GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Sikkerhetsgruppen"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Konsulentsiden"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Side med CD-leverandører"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Retningslinjer"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Systemadministrasjon"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -318,7 +318,7 @@ msgstr ""
"maskiner, slik som passordproblemer eller behov for å ha en særskilt pakke "
"installert."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -328,106 +328,103 @@ msgstr ""
"debian.org/machines.cgi\">Debians maskinside</a>. Denne skulle inneholde "
"adminstrator-opplysninger for hver maskin."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator av LDAP-utviklerlisten"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Blåkopier"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS-forvalter"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Pakkesporingssystem"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Revisor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth-administratorer"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth-administratorer"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian for barn mellom 1 og 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian for medisinsk praksis og forskning"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian for utdanning"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian på juridiske kontor"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian for folk med funksjonshemning"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian for naturvitenskap og relatert forskning"
-#~ msgid "Publicity"
-#~ msgstr "Publisitet"
-
+#: ../../english/intro/organization.data:492
#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian utviklernøkkelringlag"
-
-#, fuzzy
-#~| msgid "Release Team"
-#~ msgid "Volatile Team"
-#~ msgstr "Utgiverlag"
-
-#~ msgid "Vendors"
-#~ msgstr "Leverandører"
-
-#, fuzzy
-#~ msgid "Release Assistants"
-#~ msgstr "Utgavekoordinering"
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian for utdanning"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postliste-arkiver"
+#~ msgid "Testing Security Team"
+#~ msgstr "Lag for sikkerhet testing"
-#~ msgid "Mailing list"
-#~ msgstr "Postliste"
+#~ msgid "Security Audit Project"
+#~ msgstr "Sikkerhetsvurderingsprosjekt"
-#~ msgid "Installation"
-#~ msgstr "Installasjon"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "nåværende leder for Debian-prosjektet"
-#~ msgid "Delegates"
-#~ msgstr "Delegater"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Tilpassede Debian distribusjoner"
-#, fuzzy
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Installasjonsystems-gruppen"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Utgiverlag for den «stabile» utgaven"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian for ikke-kommersielle organisasjoner"
+#~ msgid "APT Team"
+#~ msgstr "APT-gruppen"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
+#~ msgid "Handhelds"
+#~ msgstr "Håndholdte"
-#~ msgid "Accountant"
-#~ msgstr "Regnskapsfører"
+#~ msgid "Marketing Team"
+#~ msgstr "Markedsføringslag"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinering av nøkkelsignering"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Administratorene har ansvaret for at buildd for en spesiell arkitektur "
+#~ "(arch) kan nåes på <genericemail arch@buildd.debian.org>, for eksempel "
+#~ "<genericemail i386@buildd.debian.org>."
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -439,35 +436,56 @@ msgstr "Debian for naturvitenskap og relatert forskning"
#~ "arkitektur og en distribusjon for å se tilgjengelig buildd-er og deres "
#~ "administrator."
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Administratorene har ansvaret for at buildd for en spesiell arkitektur "
-#~ "(arch) kan nåes på <genericemail arch@buildd.debian.org>, for eksempel "
-#~ "<genericemail i386@buildd.debian.org>."
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinering av nøkkelsignering"
-#~ msgid "Marketing Team"
-#~ msgstr "Markedsføringslag"
+#~ msgid "Accountant"
+#~ msgstr "Regnskapsfører"
-#~ msgid "Handhelds"
-#~ msgstr "Håndholdte"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
-#~ msgid "APT Team"
-#~ msgstr "APT-gruppen"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian for ikke-kommersielle organisasjoner"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Utgiverlag for den «stabile» utgaven"
+#, fuzzy
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Installasjonsystems-gruppen"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Tilpassede Debian distribusjoner"
+#~ msgid "Delegates"
+#~ msgstr "Delegater"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "nåværende leder for Debian-prosjektet"
+#~ msgid "Installation"
+#~ msgstr "Installasjon"
-#~ msgid "Security Audit Project"
-#~ msgstr "Sikkerhetsvurderingsprosjekt"
+#~ msgid "Mailing list"
+#~ msgstr "Postliste"
-#~ msgid "Testing Security Team"
-#~ msgstr "Lag for sikkerhet testing"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postliste-arkiver"
+
+#, fuzzy
+#~ msgid "Release Assistants"
+#~ msgstr "Utgavekoordinering"
+
+#~ msgid "Vendors"
+#~ msgstr "Leverandører"
+
+#, fuzzy
+#~| msgid "Release Team"
+#~ msgid "Volatile Team"
+#~ msgstr "Utgiverlag"
+
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian utviklernøkkelringlag"
+
+#~ msgid "Publicity"
+#~ msgstr "Publisitet"
+
+#~ msgid "Auditor"
+#~ msgstr "Revisor"
+
+#~ msgid "Live System Team"
+#~ msgstr "Gruppen for «live»-system"
diff --git a/norwegian/po/others.nb.po b/norwegian/po/others.nb.po
index 2e3567f1689..b2b0257743b 100644
--- a/norwegian/po/others.nb.po
+++ b/norwegian/po/others.nb.po
@@ -321,131 +321,131 @@ msgstr "Versjon"
msgid "URL"
msgstr "Nettadresse"
-#~ msgid "p<get-var page />"
-#~ msgstr "s.<get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "Ønsket:"
-#~ msgid "developers only"
-#~ msgstr "kun for utviklere"
+#~ msgid "Who:"
+#~ msgstr "Hvem:"
-#~ msgid "deity developers only"
-#~ msgstr "kun for deity-utviklere"
+#~ msgid "Architecture:"
+#~ msgstr "Arkitektur:"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "Kun for Debians tekniske komité"
+#~ msgid "Specifications:"
+#~ msgstr "Spesifikasjoner:"
-#~ msgid "closed"
-#~ msgstr "lukket"
+#~ msgid "Where:"
+#~ msgstr "Hvor:"
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "Name:"
+#~ msgstr "Navn:"
-#~ msgid "Unsubscribe"
-#~ msgstr "Si opp"
+#~ msgid "Company:"
+#~ msgstr "Selskap:"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Velg listene du vil si opp abonnementet på:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "or"
+#~ msgstr "eller"
+
+#~ msgid "Email:"
+#~ msgstr "E-post:"
+
+#~ msgid "Rates:"
+#~ msgstr "Takst:"
+
+#~ msgid "Willing to Relocate"
+#~ msgstr "Villig å flytte"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
-#~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
-#~ "du sier opp via e-post. En <a href=\"unsubscribe\">abonnementside</a> er "
-#~ "også tilgjengelig, for å abonnere på postlister. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr "<total_consultant> Debian-konsulenter i <total_country> land vist."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Oppsigelse av postliste-abonnement"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postliste-abonnement"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
-#~ "Vennligst respektér <a href=\"./#ads\">Debians retningslinjer for "
-#~ "postlisteannonsering</a>."
-
-#~ msgid "Clear"
-#~ msgstr "Nullstill"
+#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
+#~ "du abonnerer via e-post. En <a href=\"unsubscribe\">oppsigelsesnettside</"
+#~ "a> er også tilgjengelig, for å si opp postlisteabonnementer. "
-#~ msgid "Subscribe"
-#~ msgstr "Abonnér"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Velg listene du vil abonnere på"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "E-postadressen din:"
+#~ msgid "No description given"
+#~ msgstr "Beskrivelse savnes"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "er en oppsummert versjon som bare kan leses."
+#~ msgid "Moderated:"
+#~ msgstr "Ordstyrt:"
-#~ msgid "Subscription:"
-#~ msgstr "Abonnement:"
+# Sjekkes!
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Kun medlemmer kan sende meldinger."
# Sjekkes!
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
#~ msgstr "Listen godtar kun meldinger signert av Debianutviklere."
-# Sjekkes!
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Kun medlemmer kan sende meldinger."
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
-#~ msgid "Moderated:"
-#~ msgstr "Ordstyrt:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "er en oppsummert versjon som bare kan leses."
-#~ msgid "No description given"
-#~ msgstr "Beskrivelse savnes"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "E-postadressen din:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Velg listene du vil abonnere på"
+#~ msgid "Subscribe"
+#~ msgstr "Abonnér"
+
+#~ msgid "Clear"
+#~ msgstr "Nullstill"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
-#~ "du abonnerer via e-post. En <a href=\"unsubscribe\">oppsigelsesnettside</"
-#~ "a> er også tilgjengelig, for å si opp postlisteabonnementer. "
+#~ "Vennligst respektér <a href=\"./#ads\">Debians retningslinjer for "
+#~ "postlisteannonsering</a>."
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Postliste-abonnement"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Oppsigelse av postliste-abonnement"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr "<total_consultant> Debian-konsulenter i <total_country> land vist."
-
-#~ msgid "Willing to Relocate"
-#~ msgstr "Villig å flytte"
-
-#~ msgid "Rates:"
-#~ msgstr "Takst:"
-
-#~ msgid "Email:"
-#~ msgstr "E-post:"
-
-#~ msgid "or"
-#~ msgstr "eller"
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ msgstr ""
+#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
+#~ "du sier opp via e-post. En <a href=\"unsubscribe\">abonnementside</a> er "
+#~ "også tilgjengelig, for å abonnere på postlister. "
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Velg listene du vil si opp abonnementet på:"
-#~ msgid "Company:"
-#~ msgstr "Selskap:"
+#~ msgid "Unsubscribe"
+#~ msgstr "Si opp"
-#~ msgid "Name:"
-#~ msgstr "Navn:"
+#~ msgid "open"
+#~ msgstr "åpen"
-#~ msgid "Where:"
-#~ msgstr "Hvor:"
+#~ msgid "closed"
+#~ msgstr "lukket"
-#~ msgid "Specifications:"
-#~ msgstr "Spesifikasjoner:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "Kun for Debians tekniske komité"
-#~ msgid "Architecture:"
-#~ msgstr "Arkitektur:"
+#~ msgid "deity developers only"
+#~ msgstr "kun for deity-utviklere"
-#~ msgid "Who:"
-#~ msgstr "Hvem:"
+#~ msgid "developers only"
+#~ msgstr "kun for utviklere"
-#~ msgid "Wanted:"
-#~ msgstr "Ønsket:"
+#~ msgid "p<get-var page />"
+#~ msgstr "s.<get-var page />"
diff --git a/norwegian/po/partners.nb.po b/norwegian/po/partners.nb.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/norwegian/po/partners.nb.po
+++ b/norwegian/po/partners.nb.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/norwegian/po/ports.nb.po b/norwegian/po/ports.nb.po
index bf64dcee7b2..7352a043293 100644
--- a/norwegian/po/ports.nb.po
+++ b/norwegian/po/ports.nb.po
@@ -113,32 +113,32 @@ msgstr "Debian for PowerPC"
msgid "Debian for Sparc"
msgstr "Debian for Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian for bærbare"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian for AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian for Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian for ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian for S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian for Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian for MIPS"
-#~ msgid "Main"
-#~ msgstr "Hoved"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian for Motorola 680x0"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian for Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Hoved"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian for MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian for Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian for S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian for ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian for Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian for AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian for bærbare"
diff --git a/norwegian/po/stats.nb.po b/norwegian/po/stats.nb.po
index 2952ca3061a..9d74c2b3b8c 100644
--- a/norwegian/po/stats.nb.po
+++ b/norwegian/po/stats.nb.po
@@ -25,79 +25,88 @@ msgstr "Det er %d byte å oversette."
msgid "There are %d strings to translate."
msgstr "Det er %d strenger å oversette."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Denne oversettelsen for utdatert"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Feil oversettelsesversjon"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Denne oversettelsen for utdatert"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Originalen er nyere enn denne oversettelsen"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Originalen fins ikke lenger"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "antall treff fins ikke"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "treff"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Oversettelsessammendrag for"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Ikke oversatt"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Utdatert"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Oversatt"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Oppdatert"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "filer"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "byte"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -105,136 +114,136 @@ msgstr ""
"Merk: Lista med sider er sortert etter popularitet. Hold musepekeren over "
"sidenavnet for å se antall treff."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Utdaterte oversettelser"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Fil"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Kommentar"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Logg"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Oversettelse"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Vedlikeholder"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Oversetter"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Dato"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Generelle sider som ikke er oversatt"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Ikke-oversatte generelle sider"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Nyhetsoppføringer som ikke er oversatt"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Ikke-oversatte nyhetsoppføringer"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Konsulent/brukersider som ikke er oversatt"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Ikke-oversatte konsulent/brukersider"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Internasjonale sider som ikke er oversatt"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Ikke-oversatte internasjonale sider"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Oversatte sider (oppdatert)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Oversatte maler (PO-filer)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "PO-oversettelsesstatistikk"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Fuzzy"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Ikke oversatt"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Totalt"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Totalt:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Oversatte nettsider"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Oversettelsesstatistikk etter sideantall"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Språk"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Oversettelser"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Oversatte nettsider (etter størrelse)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Oversettelsesstatistikk etter sidestørrelse"
-#~ msgid "Created with"
-#~ msgstr "Opprettet med"
-
#~ msgid "Origin"
#~ msgstr "Kilde"
+
+#~ msgid "Created with"
+#~ msgstr "Opprettet med"
diff --git a/norwegian/po/templates.nb.po b/norwegian/po/templates.nb.po
index 7b4ceb330a7..4fce34988ec 100644
--- a/norwegian/po/templates.nb.po
+++ b/norwegian/po/templates.nb.po
@@ -202,11 +202,11 @@ msgstr "i utgave 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"For å rapportere problemer med nettstedet, send e-post på engelsk til <a "
"href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. "
@@ -502,6 +502,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Merk:</em> Originalen til denne oversettelsen fins ikke lenger."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "Nettadresse"
@@ -510,242 +514,139 @@ msgstr "Nettadresse"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulentliste"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Besøk sponsoren for disse sidene"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~| msgid "Report"
+#~ msgid "Report it!"
+#~ msgstr "Rapporter det"
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "hent med jigdo"
+#~| msgid "Select a server near you"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Velg en tjener nær deg: &nbsp;"
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "hent via http/ftp"
+#~ msgid "More information:"
+#~ msgstr "Mer informasjon:"
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "Nettverksinstallasjon"
+#~ msgid "Taken by:"
+#~ msgstr "Tatt av:"
-#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "OSS"
+#~ msgid "Nobody"
+#~ msgstr "Ingen"
-#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "diverse"
+#~ msgid "Rating:"
+#~ msgstr "Vurdering:"
-#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "OSS"
+#~ msgid "More information"
+#~ msgstr "Mer informasjon"
-#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "diverse"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kommende begivenheter"
-#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "diverse"
+#~ msgid "link may no longer be valid"
+#~ msgstr "pekeren er muligvis gammel"
-#~ msgid "Debian CD team"
-#~ msgstr "Debians cd-gruppe"
+#~ msgid "When"
+#~ msgstr "Når"
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian på CD"
+#~ msgid "Where"
+#~ msgstr "Hvor"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "More Info"
+#~ msgstr "Mer informasjon"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debians engasjement"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hovedkoordinator"
-#~ msgid "buy"
-#~ msgstr "kjøp"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
-#~ msgid "net_install"
-#~ msgstr "nettinstall"
+#~ msgid "Related Links"
+#~ msgstr "Beslektede pekere"
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "diverse"
+#~ msgid "Latest News"
+#~ msgstr "Siste nytt"
+# Sjekkes!
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr ""
-#~ "Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
-#~ "for CD'er/DVD'er:"
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donasjoner"
-
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debians cd-gruppe"
+#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
+#~ "\">Debianprosjektets hjemmeside</a>."
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "foreslått"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (død peker)"
#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Under&nbsp;diskusjon"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Venter&nbsp;på&nbsp;sponsorer"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Under&nbsp;diskusjon"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Avstemming&nbsp;pågår"
-
-#~ msgid "Decided"
-#~ msgstr "Besluttet"
-
-#~ msgid "Withdrawn"
-#~ msgstr "Tilbaketrukket"
-
-#~ msgid "Other"
-#~ msgstr "Annet"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hjem&nbsp;Avstemmingssiden"
-
-#~ msgid "How&nbsp;To"
-#~ msgstr "Hvordan..."
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Følg&nbsp;et&nbsp;forslag"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Les&nbsp;et&nbsp;resultat"
-
-#~ msgid "Vote"
-#~ msgstr "Stem"
-
-#~ msgid "discussed"
-#~ msgstr "diskutert"
-
-#~ msgid "network install"
-#~ msgstr "nettverksinstallasjon"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "kjøp ferdige cd-avtrykk"
-
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
-#~ "å komme i kontakt med oss."
-
-#~ msgid "download with pik"
-#~ msgstr "hent med pik"
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (død peker)"
-
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Sikkerhetsmelding fra Debian"
-
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Sikkerhetsmeldinger fra Debian"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Sårbar"
-
-#~ msgid "Fixed in"
-#~ msgstr "Rettet i"
-
-#~ msgid "Source:"
-#~ msgstr "Kildekode:"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arkitekturuavhengig bestanddel:"
-
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
-#~ "var url />\">originale sikkerhetsmeldingen</a>."
+#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
-#~ msgid "No other external database security references currently available."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
#~ msgstr ""
-#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
-
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
-
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
-
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "I Mitre's CVE-ordbok:"
-
-#~ msgid "Security database references"
-#~ msgstr "Referanser i sikkerhetsdatabaser"
-
-#~ msgid "License Information"
-#~ msgstr "Lisensinformasjon"
+#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "diverse"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#, fuzzy
+#~ msgid "<void id=\"singular\" />It was translated by %s."
#~ msgstr ""
#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
-
#, fuzzy
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgid "<void id=\"plural\" />It was translated by %s."
#~ msgstr ""
#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
@@ -757,138 +658,241 @@ msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
#~ "a>."
#, fuzzy
-#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
#~ msgstr ""
#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
-#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
#~ "a>."
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "diverse"
+
+#~ msgid "License Information"
+#~ msgstr "Lisensinformasjon"
+
+#~ msgid "Security database references"
+#~ msgstr "Referanser i sikkerhetsdatabaser"
+
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "I Mitre's CVE-ordbok:"
+
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
+
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
+
+#~ msgid "No other external database security references currently available."
#~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgid ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
#~ msgstr ""
-#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
+#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
+#~ "var url />\">originale sikkerhetsmeldingen</a>."
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arkitekturuavhengig bestanddel:"
+
+#~ msgid "Source:"
+#~ msgstr "Kildekode:"
+
+#~ msgid "Fixed in"
+#~ msgstr "Rettet i"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Sårbar"
+
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Sikkerhetsmeldinger fra Debian"
+
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Sikkerhetsmelding fra Debian"
+
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (død peker)"
+
+#~ msgid "download with pik"
+#~ msgstr "hent med pik"
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
+#~ "å komme i kontakt med oss."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (død peker)"
+#~ msgid "buy pre-made images"
+#~ msgstr "kjøp ferdige cd-avtrykk"
+
+#~ msgid "network install"
+#~ msgstr "nettverksinstallasjon"
+
+#~ msgid "discussed"
+#~ msgstr "diskutert"
+
+#~ msgid "Vote"
+#~ msgstr "Stem"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Les&nbsp;et&nbsp;resultat"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Følg&nbsp;et&nbsp;forslag"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
+
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hvordan..."
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hjem&nbsp;Avstemmingssiden"
+
+#~ msgid "Other"
+#~ msgstr "Annet"
+
+#~ msgid "Withdrawn"
+#~ msgstr "Tilbaketrukket"
+
+#~ msgid "Decided"
+#~ msgstr "Besluttet"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Avstemming&nbsp;pågår"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Venter&nbsp;på&nbsp;sponsorer"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
+
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "foreslått"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "Debians cd-gruppe"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donasjoner"
-# Sjekkes!
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
-#~ "\">Debianprosjektets hjemmeside</a>."
+#~ "Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
+#~ "for CD'er/DVD'er:"
-#~ msgid "Latest News"
-#~ msgstr "Siste nytt"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "diverse"
-#~ msgid "Related Links"
-#~ msgstr "Beslektede pekere"
+#~ msgid "net_install"
+#~ msgstr "nettinstall"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
+#~ msgid "buy"
+#~ msgstr "kjøp"
-#~ msgid "Main Coordinator"
-#~ msgstr "Hovedkoordinator"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debians engasjement"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "More Info"
-#~ msgstr "Mer informasjon"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "Where"
-#~ msgstr "Hvor"
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian på CD"
-#~ msgid "When"
-#~ msgstr "Når"
+#~ msgid "Debian CD team"
+#~ msgstr "Debians cd-gruppe"
-#~ msgid "link may no longer be valid"
-#~ msgstr "pekeren er muligvis gammel"
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "diverse"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kommende begivenheter"
+#, fuzzy
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "diverse"
-#~ msgid "More information"
-#~ msgstr "Mer informasjon"
+#, fuzzy
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "OSS"
-#~ msgid "Rating:"
-#~ msgstr "Vurdering:"
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "diverse"
-#~ msgid "Nobody"
-#~ msgstr "Ingen"
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "OSS"
-#~ msgid "Taken by:"
-#~ msgstr "Tatt av:"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "Nettverksinstallasjon"
-#~ msgid "More information:"
-#~ msgstr "Mer informasjon:"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "hent via http/ftp"
-#~| msgid "Select a server near you"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Velg en tjener nær deg: &nbsp;"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "hent med jigdo"
-#~| msgid "Report"
-#~ msgid "Report it!"
-#~ msgstr "Rapporter det"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Besøk sponsoren for disse sidene"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulentliste"
diff --git a/norwegian/po/vendors.nb.po b/norwegian/po/vendors.nb.po
index 1a1e824998c..60f597676ad 100644
--- a/norwegian/po/vendors.nb.po
+++ b/norwegian/po/vendors.nb.po
@@ -63,75 +63,75 @@ msgstr "kildekode"
msgid "and"
msgstr "og"
-#~ msgid "updated monthly"
-#~ msgstr "oppdateres månedlig"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "oppdateres to ganger i uken"
+#~ msgid "Vendor:"
+#~ msgstr "Leverandør:"
-#~ msgid "updated weekly"
-#~ msgstr "oppdateres ukentlig"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL for Debiansiden:"
-#~ msgid "reseller"
-#~ msgstr "videreformidler"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tar imot bidrag til Debian:"
-#~ msgid "reseller of $var"
-#~ msgstr "videreformidler av $var"
+#~ msgid "Country:"
+#~ msgstr "Land:"
-#~ msgid "Custom Release"
-#~ msgstr "Bestillingsverk"
+#~ msgid "Ship International:"
+#~ msgstr "Sender til utlandet:"
-#~ msgid "vendor additions"
-#~ msgstr "tillegg fra leverandør"
+#~ msgid "email:"
+#~ msgstr "epost:"
-#~ msgid "contrib included"
-#~ msgstr "contrib inkludert"
+#~ msgid "CD Type:"
+#~ msgstr "CD-type:"
-#~ msgid "non-free included"
-#~ msgstr "non-free inkludert"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-type:"
-#~ msgid "non-US included"
-#~ msgstr "non-US inkludert"
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Fler-distribusjon"
+#~ msgid "Official CD"
+#~ msgstr "Offisiell CD"
-#~ msgid "Vendor Release"
-#~ msgstr "Leverandørutgave"
+#, fuzzy
+#~ msgid "Official DVD"
+#~ msgstr "Offisiell CD"
#~ msgid "Development Snapshot"
#~ msgstr "Utviklingsversjon"
-#, fuzzy
-#~ msgid "Official DVD"
-#~ msgstr "Offisiell CD"
+#~ msgid "Vendor Release"
+#~ msgstr "Leverandørutgave"
-#~ msgid "Official CD"
-#~ msgstr "Offisiell CD"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Fler-distribusjon"
-#~ msgid "Architectures:"
-#~ msgstr "Arkitekturer:"
+#~ msgid "non-US included"
+#~ msgstr "non-US inkludert"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD-type:"
+#~ msgid "non-free included"
+#~ msgstr "non-free inkludert"
-#~ msgid "CD Type:"
-#~ msgstr "CD-type:"
+#~ msgid "contrib included"
+#~ msgstr "contrib inkludert"
-#~ msgid "email:"
-#~ msgstr "epost:"
+#~ msgid "vendor additions"
+#~ msgstr "tillegg fra leverandør"
-#~ msgid "Ship International:"
-#~ msgstr "Sender til utlandet:"
+#~ msgid "Custom Release"
+#~ msgstr "Bestillingsverk"
-#~ msgid "Country:"
-#~ msgstr "Land:"
+#~ msgid "reseller of $var"
+#~ msgstr "videreformidler av $var"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Tar imot bidrag til Debian:"
+#~ msgid "reseller"
+#~ msgstr "videreformidler"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL for Debiansiden:"
+#~ msgid "updated weekly"
+#~ msgstr "oppdateres ukentlig"
-#~ msgid "Vendor:"
-#~ msgstr "Leverandør:"
+#~ msgid "updated twice weekly"
+#~ msgstr "oppdateres to ganger i uken"
+
+#~ msgid "updated monthly"
+#~ msgstr "oppdateres månedlig"
diff --git a/persian/po/blends.fa.po b/persian/po/blends.fa.po
index 64b8c15bf29..b00934651af 100644
--- a/persian/po/blends.fa.po
+++ b/persian/po/blends.fa.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/persian/po/bugs.fa.po b/persian/po/bugs.fa.po
index d1cc0b81b3e..6ec60efd843 100644
--- a/persian/po/bugs.fa.po
+++ b/persian/po/bugs.fa.po
@@ -160,152 +160,152 @@ msgstr "بایگانی شده"
msgid "Archived and Unarchived"
msgstr "بایگانی شده و بایگانی نشده"
-#~ msgid "Exclude tag:"
-#~ msgstr "کنارگذاری برچسب:"
-
-#~ msgid "Include tag:"
-#~ msgstr "شامل برچسب:"
+#~ msgid "Flags:"
+#~ msgstr "پرچم‌ها"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "اشکالات حل نشده"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "اشکالات ادغام شده را فقط یک بار نمایش بده"
-#~ msgid "wontfix"
-#~ msgstr "حل نخواهد شد"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ترتیب بدون توجه به وضعیت یا درجه شدت"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "عدم نمایش فهرست محتویات در سرایند"
-#~ msgid "unreproducible"
-#~ msgstr "غیر قابل تولید مجدد"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "عدم نمایش آمارها در زیرنویس‌ها"
-#~ msgid "security"
-#~ msgstr "امنیت"
+#~ msgid "proposed-updates"
+#~ msgstr "به روز رسانی‌های پیشنهادی"
-#~ msgid "patch"
-#~ msgstr "وصله"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "به روز رسانی‌های پیشنهادی آزمایشی"
-#~ msgid "moreinfo"
-#~ msgstr "اطلاعات بیشتر"
+#~ msgid "Package version:"
+#~ msgstr "نسخه بسته:"
-#~ msgid "l10n"
-#~ msgstr "محلی‌سازی"
+#~ msgid "Distribution:"
+#~ msgstr "توزیع:"
-#~ msgid "help"
-#~ msgstr "کمک"
+#~ msgid "bugs"
+#~ msgstr "اشکالات"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "open"
+#~ msgstr "باز"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "حل شده در تجربی"
+#~ msgid "forwarded"
+#~ msgstr "فرستاده شده"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "در جریان"
-#~ msgid "confirmed"
-#~ msgstr "تايید شده"
+#~ msgid "fixed"
+#~ msgstr "حل شده"
-#~ msgid "sid"
-#~ msgstr "سید"
+#~ msgid "done"
+#~ msgstr "انجام شده"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "Include status:"
+#~ msgstr "شامل وضعیت:"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "کنارگذاری وضعیت:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "بحرانی"
-#~ msgid "etch"
-#~ msgstr "اچ"
+#~ msgid "grave"
+#~ msgstr "خطرناک"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "جدی"
-#~ msgid "woody"
-#~ msgstr "وودی"
+#~ msgid "important"
+#~ msgstr "مهم"
-#~ msgid "potato"
-#~ msgstr "پوتاتو"
+#~ msgid "minor"
+#~ msgstr "جزئی"
-#~ msgid "Exclude severity:"
-#~ msgstr "کنارگذاری درجه شدت:"
+#~ msgid "wishlist"
+#~ msgstr "فهرست خواسته‌ها"
#~ msgid "Include severity:"
#~ msgstr "شامل درجه شدت:"
-#~ msgid "wishlist"
-#~ msgstr "فهرست خواسته‌ها"
+#~ msgid "Exclude severity:"
+#~ msgstr "کنارگذاری درجه شدت:"
-#~ msgid "minor"
-#~ msgstr "جزئی"
+#~ msgid "potato"
+#~ msgstr "پوتاتو"
-#~ msgid "important"
-#~ msgstr "مهم"
+#~ msgid "woody"
+#~ msgstr "وودی"
-#~ msgid "serious"
-#~ msgstr "جدی"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "grave"
-#~ msgstr "خطرناک"
+#~ msgid "etch"
+#~ msgstr "اچ"
-#~ msgid "critical"
-#~ msgstr "بحرانی"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "کنارگذاری وضعیت:"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "Include status:"
-#~ msgstr "شامل وضعیت:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "done"
-#~ msgstr "انجام شده"
+#~ msgid "sid"
+#~ msgstr "سید"
-#~ msgid "fixed"
-#~ msgstr "حل شده"
+#~ msgid "confirmed"
+#~ msgstr "تايید شده"
-#~ msgid "pending"
-#~ msgstr "در جریان"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "فرستاده شده"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "حل شده در تجربی"
-#~ msgid "open"
-#~ msgstr "باز"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
-#~ msgid "bugs"
-#~ msgstr "اشکالات"
+#~ msgid "help"
+#~ msgstr "کمک"
-#~ msgid "Distribution:"
-#~ msgstr "توزیع:"
+#~ msgid "l10n"
+#~ msgstr "محلی‌سازی"
-#~ msgid "Package version:"
-#~ msgstr "نسخه بسته:"
+#~ msgid "moreinfo"
+#~ msgstr "اطلاعات بیشتر"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "به روز رسانی‌های پیشنهادی آزمایشی"
+#~ msgid "patch"
+#~ msgstr "وصله"
-#~ msgid "proposed-updates"
-#~ msgstr "به روز رسانی‌های پیشنهادی"
+#~ msgid "security"
+#~ msgstr "امنیت"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "عدم نمایش آمارها در زیرنویس‌ها"
+#~ msgid "unreproducible"
+#~ msgstr "غیر قابل تولید مجدد"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "عدم نمایش فهرست محتویات در سرایند"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ترتیب بدون توجه به وضعیت یا درجه شدت"
+#~ msgid "wontfix"
+#~ msgstr "حل نخواهد شد"
-#~ msgid "display merged bugs only once"
-#~ msgstr "اشکالات ادغام شده را فقط یک بار نمایش بده"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "اشکالات حل نشده"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "پرچم‌ها"
+#~ msgid "Include tag:"
+#~ msgstr "شامل برچسب:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "کنارگذاری برچسب:"
diff --git a/persian/po/distrib.fa.po b/persian/po/distrib.fa.po
index 13e7fe855e6..b1c5e016841 100644
--- a/persian/po/distrib.fa.po
+++ b/persian/po/distrib.fa.po
@@ -213,29 +213,29 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "اسپارک"
-#~ msgid "Hurd (i386)"
-#~ msgstr "هرد (i386)"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "بسته‌هایی که شامل پرونده‌ها یا شاخه‌هایی با این نام باشند"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "all files in this package"
+#~ msgstr "تمام پرونده‌های موجود در این بسته"
-#~ msgid "Search case sensitive"
-#~ msgstr "جستجو در حالت حساس به حروف کوچک و بزرگ"
+#~ msgid "Case sensitive"
+#~ msgstr "حساس به حروف کوچک و بزرگ"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "جستجو در زیرواژه‌ها"
+#~ msgid "no"
+#~ msgstr "نه"
#~ msgid "yes"
#~ msgstr "بله"
-#~ msgid "no"
-#~ msgstr "نه"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "جستجو در زیرواژه‌ها"
-#~ msgid "Case sensitive"
-#~ msgstr "حساس به حروف کوچک و بزرگ"
+#~ msgid "Search case sensitive"
+#~ msgstr "جستجو در حالت حساس به حروف کوچک و بزرگ"
-#~ msgid "all files in this package"
-#~ msgstr "تمام پرونده‌های موجود در این بسته"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "بسته‌هایی که شامل پرونده‌ها یا شاخه‌هایی با این نام باشند"
+#~ msgid "Hurd (i386)"
+#~ msgstr "هرد (i386)"
diff --git a/persian/po/doc.fa.po b/persian/po/doc.fa.po
index 665ff109744..d021a8a9d10 100644
--- a/persian/po/doc.fa.po
+++ b/persian/po/doc.fa.po
@@ -30,8 +30,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -55,31 +55,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -91,7 +67,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -103,7 +79,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -111,6 +87,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "نویسنده:"
@@ -163,10 +155,10 @@ msgstr "(نسخه‌ی <get-var version />)"
msgid "plain text"
msgstr "متن خالص"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -191,12 +183,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -227,12 +213,12 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
+#~ msgid "Language:"
+#~ msgstr "زبان:"
+
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "از <a href=\"cvs\">SVN</a> برای دریافت منبع SGML متن برای <get-var "
#~ "ddp_pkg_loc /> استفاده کنید."
-
-#~ msgid "Language:"
-#~ msgstr "زبان:"
diff --git a/persian/po/mailinglists.fa.po b/persian/po/mailinglists.fa.po
index b6ee7706a9b..4044e9f9595 100644
--- a/persian/po/mailinglists.fa.po
+++ b/persian/po/mailinglists.fa.po
@@ -128,9 +128,9 @@ msgstr "باز"
msgid "closed"
msgstr "بسته"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
diff --git a/persian/po/organization.fa.po b/persian/po/organization.fa.po
index 88114341876..91d43a3f11d 100644
--- a/persian/po/organization.fa.po
+++ b/persian/po/organization.fa.po
@@ -75,22 +75,22 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr ""
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr ""
@@ -107,286 +107,296 @@ msgstr "رهبر"
msgid "Technical Committee"
msgstr "شورای فنی"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "منشی"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "پروژه توسعه"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "بایگانی FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "مدیر FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "دستیار FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "مدیریت انتشار"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "تیم انتشار"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "کنترل کیفیت"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "تیم سیستم نصب"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "نکته های انتشار"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD Images"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "محصول"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "تنظیمات خاص"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "لپ تاپ ها"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "فایروال ها"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "صفحات وب"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "سیاره دبیان"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "رویدادها"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "شورای فنی"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "پشتیبانی کاربران"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "تیم امنیت"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "صفحه مشاوره ها"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "صفحه فروشندگان CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "سیاست"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "مدیر سیستم"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
"contain per-machine administrator information."
msgstr ""
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "آینه های دریافت"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "نگهدارنده DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "System Administration"
+msgid "Salsa administrators"
+msgstr "مدیر سیستم"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
-#~ msgid "Volatile Team"
-#~ msgstr "تیم Volatile"
+#: ../../english/intro/organization.data:492
+msgid "Debian for astronomy"
+msgstr ""
-#~ msgid "Vendors"
-#~ msgstr "فروشنده ها"
+#~ msgid "Testing Security Team"
+#~ msgstr "تیم تست امنیت"
#~ msgid "Security Audit Project"
#~ msgstr "تیم بررسی امنیت"
-#~ msgid "Testing Security Team"
-#~ msgstr "تیم تست امنیت"
+#~ msgid "Vendors"
+#~ msgstr "فروشنده ها"
+
+#~ msgid "Volatile Team"
+#~ msgstr "تیم Volatile"
diff --git a/persian/po/others.fa.po b/persian/po/others.fa.po
index 3c719427313..852791d090e 100644
--- a/persian/po/others.fa.po
+++ b/persian/po/others.fa.po
@@ -341,69 +341,82 @@ msgstr "نسخه"
msgid "URL"
msgstr "نشانی اینترنتی"
-#~ msgid "Name:"
-#~ msgstr "نام:"
+#~ msgid "Wanted:"
+#~ msgstr "خواسته شده:"
-#~ msgid "Company:"
-#~ msgstr "شرکت:"
+#~ msgid "Who:"
+#~ msgstr "چه کسی:"
-#~ msgid "URL:"
-#~ msgstr "نشانی اینترنتی:"
+#~ msgid "Architecture:"
+#~ msgstr "معماری:"
-#~ msgid "or"
-#~ msgstr "یا"
+#~ msgid "Specifications:"
+#~ msgstr "مشخصات:"
-#~ msgid "Email:"
-#~ msgstr "پست الکترونیکی:"
+#~ msgid "Where:"
+#~ msgstr "کجا:"
-#~ msgid "Rates:"
-#~ msgstr "میزان‌ها:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Willing to Relocate"
-#~ msgstr "خواهان جابجایی"
+#~ msgid "Previous Talks:"
+#~ msgstr "صحبت‌های قبلی:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
-#~ "شده‌اند."
+#~ msgid "Languages:"
+#~ msgstr "زبان‌ها:"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "عضویت در لیست پستی"
+#~ msgid "Location:"
+#~ msgstr "مکان:"
+
+#~ msgid "Topics:"
+#~ msgstr "سرفصل‌ها:"
+
+#~ msgid "closed"
+#~ msgstr "بسته"
+
+#~ msgid "open"
+#~ msgstr "باز"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "لغو عضویت"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr ""
+#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
#~ "برای کسب اطلاعات از نحوه عضویت توسط پست الکترونیکی صفحه <a href=\"./"
#~ "#subunsub\">لیست‌های پستی</a> را مطالعه کنید. همچنین <a href=\"unsubscribe"
#~ "\">فرم لغو عضویت</a> نیز برای لغو عضویت شما از لیست‌های پستی در دسترس است."
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "لغو عضویت لیست پستی"
+
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "توجه داشته باشید که بیشتر لیست‌های پستی دبیان انجمنهای عمومی هستند٬ هر "
-#~ "نامه‌ای که به آن فرستاده می‌شود٬ در بایگانی لیست پستی به صورت عمومی منتشر "
-#~ "می‌شود و توسط موتورهای جستجو طبقه‌بندی می‌گردد. شما برای عضویت در لیست پستی "
-#~ "باید از آدرس پست الکترونیکی استفاده کنید که انتشار آن به صورت عمومی برای "
-#~ "شما اهمیتی نداشته باشد."
+#~ "لطفاً به <a href=\"./#ads\">سیاستهای تبلیغاتی لیست پستی دبیان </a> احترام "
+#~ "بگذارید."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
+#~ msgid "Clear"
+#~ msgstr "پاک کردن"
-#~ msgid "No description given"
-#~ msgstr "توضیحی در دسترس نیست"
+#~ msgid "Subscribe"
+#~ msgstr "عضویت"
-#~ msgid "Moderated:"
-#~ msgstr "کنترل شده:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "آدرس پست الکترونیکی شما"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "تنها اعضاء اجازه ارسال پیغام دارند."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "یک نسخه خلاصه شده٬ فقط خواندنی است."
+
+#~ msgid "Subscription:"
+#~ msgstr "عضویت:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -411,79 +424,66 @@ msgstr "نشانی اینترنتی"
#~ "تنها پیغام‌هایی که توسط توسعه‌دهندگان دبیان مشخص شده‌اند در این لیست پذیرفته "
#~ "می‌شوند."
-#~ msgid "Subscription:"
-#~ msgstr "عضویت:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "یک نسخه خلاصه شده٬ فقط خواندنی است."
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "تنها اعضاء اجازه ارسال پیغام دارند."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "آدرس پست الکترونیکی شما"
+#~ msgid "Moderated:"
+#~ msgstr "کنترل شده:"
-#~ msgid "Subscribe"
-#~ msgstr "عضویت"
+#~ msgid "No description given"
+#~ msgstr "توضیحی در دسترس نیست"
-#~ msgid "Clear"
-#~ msgstr "پاک کردن"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "لطفاً به <a href=\"./#ads\">سیاستهای تبلیغاتی لیست پستی دبیان </a> احترام "
-#~ "بگذارید."
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "لغو عضویت لیست پستی"
+#~ "توجه داشته باشید که بیشتر لیست‌های پستی دبیان انجمنهای عمومی هستند٬ هر "
+#~ "نامه‌ای که به آن فرستاده می‌شود٬ در بایگانی لیست پستی به صورت عمومی منتشر "
+#~ "می‌شود و توسط موتورهای جستجو طبقه‌بندی می‌گردد. شما برای عضویت در لیست پستی "
+#~ "باید از آدرس پست الکترونیکی استفاده کنید که انتشار آن به صورت عمومی برای "
+#~ "شما اهمیتی نداشته باشد."
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
#~ "برای کسب اطلاعات از نحوه عضویت توسط پست الکترونیکی صفحه <a href=\"./"
#~ "#subunsub\">لیست‌های پستی</a> را مطالعه کنید. همچنین <a href=\"unsubscribe"
#~ "\">فرم لغو عضویت</a> نیز برای لغو عضویت شما از لیست‌های پستی در دسترس است."
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr ""
-#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "لغو عضویت"
-
-#~ msgid "open"
-#~ msgstr "باز"
-
-#~ msgid "closed"
-#~ msgstr "بسته"
-
-#~ msgid "Topics:"
-#~ msgstr "سرفصل‌ها:"
-
-#~ msgid "Location:"
-#~ msgstr "مکان:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "عضویت در لیست پستی"
-#~ msgid "Languages:"
-#~ msgstr "زبان‌ها:"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
+#~ "شده‌اند."
-#~ msgid "Previous Talks:"
-#~ msgstr "صحبت‌های قبلی:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "خواهان جابجایی"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Rates:"
+#~ msgstr "میزان‌ها:"
-#~ msgid "Where:"
-#~ msgstr "کجا:"
+#~ msgid "Email:"
+#~ msgstr "پست الکترونیکی:"
-#~ msgid "Specifications:"
-#~ msgstr "مشخصات:"
+#~ msgid "or"
+#~ msgstr "یا"
-#~ msgid "Architecture:"
-#~ msgstr "معماری:"
+#~ msgid "URL:"
+#~ msgstr "نشانی اینترنتی:"
-#~ msgid "Who:"
-#~ msgstr "چه کسی:"
+#~ msgid "Company:"
+#~ msgstr "شرکت:"
-#~ msgid "Wanted:"
-#~ msgstr "خواسته شده:"
+#~ msgid "Name:"
+#~ msgstr "نام:"
diff --git a/persian/po/partners.fa.po b/persian/po/partners.fa.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/persian/po/partners.fa.po
+++ b/persian/po/partners.fa.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/persian/po/ports.fa.po b/persian/po/ports.fa.po
index 75f7d1a4ba8..3d526458f03 100644
--- a/persian/po/ports.fa.po
+++ b/persian/po/ports.fa.po
@@ -117,32 +117,32 @@ msgstr "دبیان برای PowerPC"
msgid "Debian for Sparc"
msgstr "دبیان برای Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "دبیان برای لپ تاپ"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "دبیان برای AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "دبیان برای Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "دبیان برای ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "دبیان برای S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "دبیان برای Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "دبیان برای MIPS"
-#~ msgid "Main"
-#~ msgstr "اصلی"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "دبیان برای موتورولا 680x0"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "دبیان برای GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "دبیان برای موتورولا 680x0"
+#~ msgid "Main"
+#~ msgstr "اصلی"
-#~ msgid "Debian for MIPS"
-#~ msgstr "دبیان برای MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "دبیان برای Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "دبیان برای S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "دبیان برای ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "دبیان برای Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "دبیان برای AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "دبیان برای لپ تاپ"
diff --git a/persian/po/stats.fa.po b/persian/po/stats.fa.po
index 5245175364a..4550ca8d322 100644
--- a/persian/po/stats.fa.po
+++ b/persian/po/stats.fa.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/persian/po/templates.fa.po b/persian/po/templates.fa.po
index 566ef2a1f31..a217f7d5e74 100644
--- a/persian/po/templates.fa.po
+++ b/persian/po/templates.fa.po
@@ -214,11 +214,11 @@ msgstr "در انتشار ۲.۲"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"برای گزارش مشکلات وب سایت به <a href=\"mailto:debian-www@lists.debian.org"
"\">debian-www@lists.debian.org</a> نامه بزنید. برای دیدن اطلاعات تماس دیگر, "
@@ -521,6 +521,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>توجه:</em> سند اصلی این ترجمه دیگر در دسترس نیست."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -529,26 +533,26 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "بازگشت به <a href=\"../\">صفحه چه کسی از دبیان استفاده می کند؟</a>."
-#~ msgid "Rating:"
-#~ msgstr "درجه بندی:"
-
-#~ msgid "Nobody"
-#~ msgstr "هیچ کس"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "حامی این سایت را ببینید"
-#~ msgid "Taken by:"
-#~ msgstr "گرفته شده توسط:"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "آیا در صفحه آرایی سایت مشکلی می بینید؟"
-#~ msgid "More information:"
-#~ msgstr "اطلاعات بیشتر:"
+#~ msgid "Report it!"
+#~ msgstr "گزارش کنید!"
#~ msgid "Select a server near you: &nbsp;"
#~ msgstr "سروری که به شما نزدیک است را انتخاب کنید:"
-#~ msgid "Report it!"
-#~ msgstr "گزارش کنید!"
+#~ msgid "More information:"
+#~ msgstr "اطلاعات بیشتر:"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "آیا در صفحه آرایی سایت مشکلی می بینید؟"
+#~ msgid "Taken by:"
+#~ msgstr "گرفته شده توسط:"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "حامی این سایت را ببینید"
+#~ msgid "Nobody"
+#~ msgstr "هیچ کس"
+
+#~ msgid "Rating:"
+#~ msgstr "درجه بندی:"
diff --git a/persian/po/vendors.fa.po b/persian/po/vendors.fa.po
index 0ee5ae394e7..1f7f345054e 100644
--- a/persian/po/vendors.fa.po
+++ b/persian/po/vendors.fa.po
@@ -69,29 +69,29 @@ msgstr "منبع"
msgid "and"
msgstr "و"
-#~ msgid "Architectures:"
-#~ msgstr "معماری:"
+#~ msgid "Vendor:"
+#~ msgstr "فروشنده:"
-#~ msgid "DVD Type:"
-#~ msgstr "نوع DVD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL برای صفحه دبیان:"
-#~ msgid "CD Type:"
-#~ msgstr "نوع CD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "اجازه دادن به همکاری با دبیان:"
-#~ msgid "email:"
-#~ msgstr "پست الکترونیکی:"
+#~ msgid "Country:"
+#~ msgstr "کشور:"
#~ msgid "Ship International:"
#~ msgstr "ارسال بین المللی:"
-#~ msgid "Country:"
-#~ msgstr "کشور:"
+#~ msgid "email:"
+#~ msgstr "پست الکترونیکی:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "اجازه دادن به همکاری با دبیان:"
+#~ msgid "CD Type:"
+#~ msgstr "نوع CD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL برای صفحه دبیان:"
+#~ msgid "DVD Type:"
+#~ msgstr "نوع DVD:"
-#~ msgid "Vendor:"
-#~ msgstr "فروشنده:"
+#~ msgid "Architectures:"
+#~ msgstr "معماری:"
diff --git a/polish/po/blends.pl.po b/polish/po/blends.pl.po
index 64b8c15bf29..b00934651af 100644
--- a/polish/po/blends.pl.po
+++ b/polish/po/blends.pl.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/polish/po/doc.pl.po b/polish/po/doc.pl.po
index 3ee4fa4eedc..d78488ecd65 100644
--- a/polish/po/doc.pl.po
+++ b/polish/po/doc.pl.po
@@ -30,8 +30,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
#, fuzzy
#| msgid ""
#| "Written by two Debian developers, this free book\n"
@@ -86,46 +86,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:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-"Książka ta jest przeznaczona dla deweloperów pracujących z\n"
-" GNU/Linuksem na procesorach ARM. Omawia ona specjalne urządzenia\n"
-" przystosowane do szybkiej konfiguracji (LART, Assabet,\n"
-" Psion5). Dostarcza ona również podstawowych informacji na temat\n"
-" narzędzi i technik używanych przy pracy nad tą\n"
-" architekturą. Omawia zestaw narzędzi programistycznych GNU\n"
-" (tzw. GNU toolchain), kompilatory natywne i skrośne\n"
-" (cross-kompilatory), programy rozruchowe (bootloadery), łaty na\n"
-" jądro, RAM dyski, cechy charakterystyczne dla ARM i omawia\n"
-" inne zasoby nt. architektury ARM. Książka zawiera również obszerny\n"
-" samouczek o systemie GNU/Linux dla programistów innych platform.\n"
-" Książka ta nie jest o Debianie, jednakże dystrybucja Aleph\n"
-" ARMLinux jest ściśle oparta na Debian-ARM i przypuszczalnie\n"
-" będziesz pracował z tą dystrybucją, a także będziesz posiadał\n"
-" maszynę-hosta opartą na Debianie."
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -145,7 +106,7 @@ msgstr ""
" udoskonalić ich umiejętności oraz administratorów, którzy chcą\n"
" budować niezawodne sieci oparte na Debianie."
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -157,7 +118,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
#, fuzzy
#| msgid ""
#| "This book teaches you how to install and configure the system and also "
@@ -176,6 +137,22 @@ 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
+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:"
@@ -228,13 +205,13 @@ msgstr "(wersja <get-var version />)"
msgid "plain text"
msgstr "czysty tekst"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
-"href=\"https://www.debian.org/doc/cvs\">Subversion</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
@@ -262,14 +239,6 @@ msgstr ""
"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
"href=\"https://packages.debian.org/subversion\">Subversion</a>."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
-"href=\"https://packages.debian.org/git\">Git</a>."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -300,161 +269,116 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
-#~ msgstr ""
-#~ "To jest właściwa książka, jeśli chcesz nauczyć się jak tworzyć proste i "
-#~ "złożone platformy IT wykorzystując jedynie Wolne Oprogramowanie. Wewnątrz "
-#~ "znajdziesz szeroką gamę procedur przejrzanych i dopasowanych by pasowały "
-#~ "do najlepszych wzorów implementacji infrastruktury technologicznej. Ten "
-#~ "łatwy w czytaniu i wszechstronny przewodnik poprowadzi Cię za rękę "
-#~ "umożliwiając Ci osiągnięcie konkretnych celów przy pomocy systemu "
-#~ "operacyjnego Debian GNU/Linux."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD z instalatorem Sarge'a oraz wybranymi pakietami"
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Ta książka jest podzielona na cztery części: Podstawowe pojęcia,\n"
-#~ " Zarządzanie GNU/Linuksem, Administracja systemem i Zaawansowane\n"
-#~ " operacje. Każdy rozdział dokładnie omawia funkcje systemu\n"
-#~ " operacyjnego. Pierwsze rozdziały wyjaśniają strukturę systemu\n"
-#~ " GNU/Linux. Rozdziały te pomogą czytelnikowi zrozumieć, jak system\n"
-#~ " używa podstawowych zasobów, takich jak procesor oraz\n"
-#~ " pamięć. Dokładniejsza analiza systemów plików takich jak Ext2, Ext3\n"
-#~ " oraz ReiserFS umożliwi użytkownikom dokonanie właściwego wyboru\n"
-#~ " według ich potrzeb. W całej książce są też grafiki ilustrujące\n"
-#~ " aspekt wydajności systemu. Książka jest przeznaczona dla\n"
-#~ " studentów uczelni wyższych oraz wszystkich tych, którzy chcą\n"
-#~ " gruntownie poznać system GNU/Linux. Informacje podane w książce\n"
-#~ " oparte są na wydaniu Sarge."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live CD z Knoppiksem"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Pierwsza perska książka o Debianie. Książka ta pomoże Ci zainstalować\n"
-#~ " Debiana, zacząć go używać i uruchomić usługi sieciowe takie jak:\n"
-#~ " WWW, bazy danych, <i>firewall</i>, poczta, ftp. Ponadto znajdują się\n"
-#~ " tu również informacje na temat systemu pakietów w Debianie."
+#~ "Zarówno początkujący jak i zaawansowani użytkownicy znajdą w tej\n"
+#~ " książce wyczerpujące źródło informacji o użytkowaniu Debiana w domu\n"
+#~ " i w sieci komputerowej oraz użyciu systemu jako serwera\n"
+#~ " internetowego czy jako komputera programisty. Zawiera ona również\n"
+#~ " ogólne informacje na temat projektu oraz obszerną informację o "
+#~ "systemie\n"
+#~ " zarządzania pakietami w Debianie."
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "oficjalna płyta DVD Debian GNU/Linux 3.1r0a sarge (i386)"
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Ta książka wprowadza czytelników do systemu Debian GNU/Linux z za\n"
-#~ " pomocą poręcznych samouczków i wskazówek. Napisana w języku\n"
-#~ " koreańskim, zawiera rozległe spektrum informacji nt. Debiana:\n"
-#~ " konfiguracja poinstalacyjna, instalacja pakietów, konfiguracja X-ów,\n"
-#~ " podłączenie do internetu, zarządzanie siecią i wiele innych. Książka\n"
-#~ " dostarcza też garść wskazówek jak przygotować Debiana do obsługi\n"
-#~ " języka koreańskiego. Jest to dobra pozycja również dla\n"
-#~ " początkujących."
+#~ "Ta książka omawia ideę i techniki zastosowane w systemie operacyjnym\n"
+#~ " Debian, wyjaśnia ich użycie i pułapki które mogą się w nich kryć\n"
+#~ " oraz ilustruje ona tok myślenia, które sprawiło, że zastosowano\n"
+#~ " takie a nie inne podejście. Celem tej książki nie jest bycie\n"
+#~ " kompletnym podręcznikiem użytkownika Debiana, ale danie\n"
+#~ " użytkownikowi wystarczającej wiedzy do zrozumienia pracy projektu i\n"
+#~ " systemu operacyjnego, obejmującego wyrafinowane i eleganckie, czasami\n"
+#~ " z początku nie intuicyjne rozwiązania, które wyewoluowały jako\n"
+#~ " części składowe systemu Debian przez ostatnią dekadę. Książka\n"
+#~ " jest adresowana do fachowego administratora systemów\n"
+#~ " UNIX/Linux, ale może też służyć jako wyśmienite źródło wiedzy obok\n"
+#~ " standardowego podręcznika Linuksa, tak aby dobrze wykorzystać własne\n"
+#~ " doświadczenie w świecie Debiana."
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgid ""
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "trzy oficjalne płyty CD z wydaniem potato r3 i nieoficjalny CD z woody'm"
+#~ "Poręczny, kompletny przewodnik po systemie Debian GNU/Linux, który\n"
+#~ " przedstawia ponad 1500 <q>przepisów</q>, jak używać go w codziennej\n"
+#~ " pracy &mdash; od pracy z tekstem, grafiką i dźwiękiem po\n"
+#~ " zagadnienia związane z wydajnością i sieciami komputerowymi. Tak jak\n"
+#~ " opisywane oprogramowanie książka jest dostępna na\n"
+#~ " zasadach <i>copyleft</i> i jej materiały źródłowe są dostępne."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Ta książka oferuje zwięzły przewodnik po instalacji Debiana,\n"
-#~ " najważniejszych komendach Uniksowych i Linuksowych, podstawowej\n"
-#~ " konfiguracji, administracji systemem i siecią, konfiguracji serwera\n"
-#~ " X oraz multimediach w Debianie.\n"
-#~ " Książka ta zawiera również przewodnik dla opiekunów pakietów,\n"
-#~ " który ma zachęcić ludzi w Korei do zostania oficjalnym deweloperem\n"
-#~ " Debiana."
+#~ "<q>Learning Debian GNU/Linux</q> przeprowadzi nowego użytkownika\n"
+#~ " Linuksa przez instalację i konfigurację Debiana. Oprowadzani przez\n"
+#~ " Billa McCarthy'ego, użytkownicy Windowsa otrzymają łagodne\n"
+#~ " wprowadzenie do tego ekscytującego komputerowego świata."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 nieoficjalny Woody, 3 płyty z Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Ta książka porusza wszystkie najważniejsze tematy związane z\n"
-#~ " systemem Debian GNU/Linux: instalację, APT i <code>dpkg</code>,\n"
-#~ " powłokę, System X Window, usługi sieciowe, administrację systemem,\n"
-#~ " instalację jądra, współpracę z Windows, budowanie serwera itd.\n"
-#~ " Dzięki zmodyfikowanym płytom CD, będziesz w stanie bez problemu\n"
-#~ " zainstalować swój system i zacząć go używać w języku japońskim."
+#~ "Książka zawiera ponad 230 stron i 3 płyty CD. Jej tematem jest\n"
+#~ " oprogramowanie dostępne w systemie Debian GNU/Linux, sieć, narzędzia\n"
+#~ " programistyczne, graficzny interfejs użytkownika, publikowanie\n"
+#~ " dokumentów, aplikacje biznesowe, programy do zabawy i\n"
+#~ " multimedia. Dodatkowo zakup książki zapewnia 30-dniowe wsparcie\n"
+#~ " techniczne przez pocztę elektroniczną."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 edycja autora (3 płyty CD)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Jest to najnowsza książka o Sarge'u z serii, która jest uznawana za\n"
-#~ " <i>Debianową biblię</i> w Japoni. Książka ta omawia wszystkie\n"
-#~ " aspekty użytkowania systemu Debian GNU/Linux 3.1 takie jak:\n"
-#~ " instalacja, środowiska graficzne, administracja systemem i\n"
-#~ " konfiguracja serwera. Ponadto książka ta zawiera również komercyjny\n"
-#~ " pakiet z czcionkami które udekorują Twój pulpit. Ta książka powinna\n"
-#~ " być pożyteczna dla wszystkich użytkowników Debiana: zarówno\n"
-#~ " początkujących jak i zaawansowanych."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "dwie edycje: Jedna bez DVD, druga z dwiema płytami DVD (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, edycja autora (DVD + CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 i amd64) na DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Ta książka jest zorganizowana na sposób słownika zawierającego różne\n"
-#~ " wskazówki dla początkujących i średnio zaawansowanych użytkowników:\n"
-#~ " instalacja na różne sposoby, dostosowywanie pulpitu do własnych\n"
-#~ " potrzeb, rozwiązywanie problemów, co warto wiedzieć itd."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "1 CD z Debian GNU/Linux 3.1 Sarge"
+#~ "dwa wydania: jedno bez płyt, drugie z oficjalną płytą CD (i386, sekcja "
+#~ "contrib i źródła)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -487,113 +411,203 @@ msgstr "PDF"
#~ " komputerowymi, takie jak: planowanie i budowanie wdzwanianych\n"
#~ " routerów lub serwera dla klientów opartych na Windowsie (Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "1 CD z Debian GNU/Linux 3.1 Sarge"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "dwa wydania: jedno bez płyt, drugie z oficjalną płytą CD (i386, sekcja "
-#~ "contrib i źródła)"
+#~ "Ta książka jest zorganizowana na sposób słownika zawierającego różne\n"
+#~ " wskazówki dla początkujących i średnio zaawansowanych użytkowników:\n"
+#~ " instalacja na różne sposoby, dostosowywanie pulpitu do własnych\n"
+#~ " potrzeb, rozwiązywanie problemów, co warto wiedzieć itd."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 i amd64) na DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, edycja autora (DVD + CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "dwie edycje: Jedna bez DVD, druga z dwiema płytami DVD (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Jest to najnowsza książka o Sarge'u z serii, która jest uznawana za\n"
+#~ " <i>Debianową biblię</i> w Japoni. Książka ta omawia wszystkie\n"
+#~ " aspekty użytkowania systemu Debian GNU/Linux 3.1 takie jak:\n"
+#~ " instalacja, środowiska graficzne, administracja systemem i\n"
+#~ " konfiguracja serwera. Ponadto książka ta zawiera również komercyjny\n"
+#~ " pakiet z czcionkami które udekorują Twój pulpit. Ta książka powinna\n"
+#~ " być pożyteczna dla wszystkich użytkowników Debiana: zarówno\n"
+#~ " początkujących jak i zaawansowanych."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edycja autora (3 płyty CD)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Książka zawiera ponad 230 stron i 3 płyty CD. Jej tematem jest\n"
-#~ " oprogramowanie dostępne w systemie Debian GNU/Linux, sieć, narzędzia\n"
-#~ " programistyczne, graficzny interfejs użytkownika, publikowanie\n"
-#~ " dokumentów, aplikacje biznesowe, programy do zabawy i\n"
-#~ " multimedia. Dodatkowo zakup książki zapewnia 30-dniowe wsparcie\n"
-#~ " techniczne przez pocztę elektroniczną."
+#~ "Ta książka porusza wszystkie najważniejsze tematy związane z\n"
+#~ " systemem Debian GNU/Linux: instalację, APT i <code>dpkg</code>,\n"
+#~ " powłokę, System X Window, usługi sieciowe, administrację systemem,\n"
+#~ " instalację jądra, współpracę z Windows, budowanie serwera itd.\n"
+#~ " Dzięki zmodyfikowanym płytom CD, będziesz w stanie bez problemu\n"
+#~ " zainstalować swój system i zacząć go używać w języku japońskim."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 nieoficjalny Woody, 3 płyty z Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "<q>Learning Debian GNU/Linux</q> przeprowadzi nowego użytkownika\n"
-#~ " Linuksa przez instalację i konfigurację Debiana. Oprowadzani przez\n"
-#~ " Billa McCarthy'ego, użytkownicy Windowsa otrzymają łagodne\n"
-#~ " wprowadzenie do tego ekscytującego komputerowego świata."
+#~ "Ta książka oferuje zwięzły przewodnik po instalacji Debiana,\n"
+#~ " najważniejszych komendach Uniksowych i Linuksowych, podstawowej\n"
+#~ " konfiguracji, administracji systemem i siecią, konfiguracji serwera\n"
+#~ " X oraz multimediach w Debianie.\n"
+#~ " Książka ta zawiera również przewodnik dla opiekunów pakietów,\n"
+#~ " który ma zachęcić ludzi w Korei do zostania oficjalnym deweloperem\n"
+#~ " Debiana."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr ""
+#~ "trzy oficjalne płyty CD z wydaniem potato r3 i nieoficjalny CD z woody'm"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Poręczny, kompletny przewodnik po systemie Debian GNU/Linux, który\n"
-#~ " przedstawia ponad 1500 <q>przepisów</q>, jak używać go w codziennej\n"
-#~ " pracy &mdash; od pracy z tekstem, grafiką i dźwiękiem po\n"
-#~ " zagadnienia związane z wydajnością i sieciami komputerowymi. Tak jak\n"
-#~ " opisywane oprogramowanie książka jest dostępna na\n"
-#~ " zasadach <i>copyleft</i> i jej materiały źródłowe są dostępne."
+#~ "Ta książka wprowadza czytelników do systemu Debian GNU/Linux z za\n"
+#~ " pomocą poręcznych samouczków i wskazówek. Napisana w języku\n"
+#~ " koreańskim, zawiera rozległe spektrum informacji nt. Debiana:\n"
+#~ " konfiguracja poinstalacyjna, instalacja pakietów, konfiguracja X-ów,\n"
+#~ " podłączenie do internetu, zarządzanie siecią i wiele innych. Książka\n"
+#~ " dostarcza też garść wskazówek jak przygotować Debiana do obsługi\n"
+#~ " języka koreańskiego. Jest to dobra pozycja również dla\n"
+#~ " początkujących."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Ta książka omawia ideę i techniki zastosowane w systemie operacyjnym\n"
-#~ " Debian, wyjaśnia ich użycie i pułapki które mogą się w nich kryć\n"
-#~ " oraz ilustruje ona tok myślenia, które sprawiło, że zastosowano\n"
-#~ " takie a nie inne podejście. Celem tej książki nie jest bycie\n"
-#~ " kompletnym podręcznikiem użytkownika Debiana, ale danie\n"
-#~ " użytkownikowi wystarczającej wiedzy do zrozumienia pracy projektu i\n"
-#~ " systemu operacyjnego, obejmującego wyrafinowane i eleganckie, czasami\n"
-#~ " z początku nie intuicyjne rozwiązania, które wyewoluowały jako\n"
-#~ " części składowe systemu Debian przez ostatnią dekadę. Książka\n"
-#~ " jest adresowana do fachowego administratora systemów\n"
-#~ " UNIX/Linux, ale może też służyć jako wyśmienite źródło wiedzy obok\n"
-#~ " standardowego podręcznika Linuksa, tak aby dobrze wykorzystać własne\n"
-#~ " doświadczenie w świecie Debiana."
+#~ "Pierwsza perska książka o Debianie. Książka ta pomoże Ci zainstalować\n"
+#~ " Debiana, zacząć go używać i uruchomić usługi sieciowe takie jak:\n"
+#~ " WWW, bazy danych, <i>firewall</i>, poczta, ftp. Ponadto znajdują się\n"
+#~ " tu również informacje na temat systemu pakietów w Debianie."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "oficjalna płyta DVD Debian GNU/Linux 3.1r0a sarge (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Ta książka jest podzielona na cztery części: Podstawowe pojęcia,\n"
+#~ " Zarządzanie GNU/Linuksem, Administracja systemem i Zaawansowane\n"
+#~ " operacje. Każdy rozdział dokładnie omawia funkcje systemu\n"
+#~ " operacyjnego. Pierwsze rozdziały wyjaśniają strukturę systemu\n"
+#~ " GNU/Linux. Rozdziały te pomogą czytelnikowi zrozumieć, jak system\n"
+#~ " używa podstawowych zasobów, takich jak procesor oraz\n"
+#~ " pamięć. Dokładniejsza analiza systemów plików takich jak Ext2, Ext3\n"
+#~ " oraz ReiserFS umożliwi użytkownikom dokonanie właściwego wyboru\n"
+#~ " według ich potrzeb. W całej książce są też grafiki ilustrujące\n"
+#~ " aspekt wydajności systemu. Książka jest przeznaczona dla\n"
+#~ " studentów uczelni wyższych oraz wszystkich tych, którzy chcą\n"
+#~ " gruntownie poznać system GNU/Linux. Informacje podane w książce\n"
+#~ " oparte są na wydaniu Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Zarówno początkujący jak i zaawansowani użytkownicy znajdą w tej\n"
-#~ " książce wyczerpujące źródło informacji o użytkowaniu Debiana w domu\n"
-#~ " i w sieci komputerowej oraz użyciu systemu jako serwera\n"
-#~ " internetowego czy jako komputera programisty. Zawiera ona również\n"
-#~ " ogólne informacje na temat projektu oraz obszerną informację o "
-#~ "systemie\n"
-#~ " zarządzania pakietami w Debianie."
+#~ "To jest właściwa książka, jeśli chcesz nauczyć się jak tworzyć proste i "
+#~ "złożone platformy IT wykorzystując jedynie Wolne Oprogramowanie. Wewnątrz "
+#~ "znajdziesz szeroką gamę procedur przejrzanych i dopasowanych by pasowały "
+#~ "do najlepszych wzorów implementacji infrastruktury technologicznej. Ten "
+#~ "łatwy w czytaniu i wszechstronny przewodnik poprowadzi Cię za rękę "
+#~ "umożliwiając Ci osiągnięcie konkretnych celów przy pomocy systemu "
+#~ "operacyjnego Debian GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live CD z Knoppiksem"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
+#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD z instalatorem Sarge'a oraz wybranymi pakietami"
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Książka ta jest przeznaczona dla deweloperów pracujących z\n"
+#~ " GNU/Linuksem na procesorach ARM. Omawia ona specjalne urządzenia\n"
+#~ " przystosowane do szybkiej konfiguracji (LART, Assabet,\n"
+#~ " Psion5). Dostarcza ona również podstawowych informacji na temat\n"
+#~ " narzędzi i technik używanych przy pracy nad tą\n"
+#~ " architekturą. Omawia zestaw narzędzi programistycznych GNU\n"
+#~ " (tzw. GNU toolchain), kompilatory natywne i skrośne\n"
+#~ " (cross-kompilatory), programy rozruchowe (bootloadery), łaty na\n"
+#~ " jądro, RAM dyski, cechy charakterystyczne dla ARM i omawia\n"
+#~ " inne zasoby nt. architektury ARM. Książka zawiera również obszerny\n"
+#~ " samouczek o systemie GNU/Linux dla programistów innych platform.\n"
+#~ " Książka ta nie jest o Debianie, jednakże dystrybucja Aleph\n"
+#~ " ARMLinux jest ściśle oparta na Debian-ARM i przypuszczalnie\n"
+#~ " będziesz pracował z tą dystrybucją, a także będziesz posiadał\n"
+#~ " maszynę-hosta opartą na Debianie."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 ARM"
diff --git a/polish/po/organization.pl.po b/polish/po/organization.pl.po
index 5de6a11b037..3ef77aabcce 100644
--- a/polish/po/organization.pl.po
+++ b/polish/po/organization.pl.po
@@ -76,24 +76,24 @@ msgid "Officers"
msgstr "Oficerowie"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Dystrybucja"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Rozgłos"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Wsparcie i Infrastruktura"
@@ -110,211 +110,211 @@ msgstr "Prowadzący"
msgid "Technical Committee"
msgstr "Komitet Techniczny"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekretarz"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Projekty Rozwoju"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Archiwa FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Główny serwer FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Asystenci FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Kreator FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backporty"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Zespół Backportów"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Pojedyncze Pakiety"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Zarządzanie Wydaniem"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Zespół Wydania"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Kontrola Jakości"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Zespół Systemu Instalacji"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Informacje o Wydaniu"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Obrazy płyt"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produkcja"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testowanie"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infrastruktura automatycznego budowania"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Zespół wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Administracja demona Buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentacja"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista pakietów potencjalnych i wymagających dopracowania"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Zespół Systemu Live"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Adaptacje"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Konfiguracje Specjalne"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Laptopy"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Firewalle"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Systemy wbudowane"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Kontakt z prasą"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Strony internetowe"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Projekt Kobiecy Debiana"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Przeci molestowaniu"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Wydarzenia"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Komitet Techniczny"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Program partnerski"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Koordynacja darowizn sprzętu"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Wsparcie użytkowników"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "System śledzenia błędów"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administracja i archiwa list dyskusyjnych"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Dział Nowych Członków"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Menedżerowie kont Debiana"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Obsługa kluczy (PGP i GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Zespół ds. bezpieczeństwa"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Strony konsultatnów"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Strona sprzedawców płyt CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Polityka"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Administracja systemu"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -323,7 +323,7 @@ msgstr ""
"do projektu Debian, w tym problemy z hasłami lub prośby o zainstalowanie "
"pakietu."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -333,81 +333,99 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Maszyny Debiana</a>, powinna ona "
"zawierać informacje o administratorach poszczególnych maszyn."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administracja Katalogiem Deweloperów LDAP"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Serwery lustrzane"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Obsługa DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "System śledzenia pakietów"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Audyt"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
#, 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:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Administracja systemu Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administracja systemu Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian dla dzieci od lat 1 do 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian dla medycyny i badań"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian dla edukacji"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian w kancelariach prawnych"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian dla niepełnosprawnych"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian dla nauk ścisłych i powiązanych badań"
-#~ msgid "Publicity"
-#~ msgstr "Rozgłos"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian dla edukacji"
-#~ msgid "Bits from Debian"
-#~ msgstr "Informacje Debiana"
+#~ msgid "Testing Security Team"
+#~ msgstr "Zespół ds. bezpieczeństwa dla edycji testowej"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Obsługa kluczy Deweloperów Debiana (DM - Debian Maintainer)"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt audytu bezpieczeństwa"
-#~ msgid "DebConf chairs"
-#~ msgstr "przewodniczący DebConfa"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "obecny Lider Projektu Debiana"
#~ msgid "Summer of Code 2013 Administrators"
#~ msgstr "Administratorzy Summer of Code 2013"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "obecny Lider Projektu Debiana"
+#~ msgid "DebConf chairs"
+#~ msgstr "przewodniczący DebConfa"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projekt audytu bezpieczeństwa"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Obsługa kluczy Deweloperów Debiana (DM - Debian Maintainer)"
-#~ msgid "Testing Security Team"
-#~ msgstr "Zespół ds. bezpieczeństwa dla edycji testowej"
+#~ msgid "Bits from Debian"
+#~ msgstr "Informacje Debiana"
+
+#~ msgid "Publicity"
+#~ msgstr "Rozgłos"
+
+#~ msgid "Auditor"
+#~ msgstr "Audyt"
+
+#~ msgid "Live System Team"
+#~ msgstr "Zespół Systemu Live"
diff --git a/polish/po/others.pl.po b/polish/po/others.pl.po
index f96a129523e..59340784e97 100644
--- a/polish/po/others.pl.po
+++ b/polish/po/others.pl.po
@@ -333,17 +333,17 @@ msgstr "Wersja"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "Gdzie:"
+#~ msgid "Wanted:"
+#~ msgstr "Pożądane:"
-#~ msgid "Specifications:"
-#~ msgstr "Specyfikacje:"
+#~ msgid "Who:"
+#~ msgstr "Kto:"
#~ msgid "Architecture:"
#~ msgstr "Architektura:"
-#~ msgid "Who:"
-#~ msgstr "Kto:"
+#~ msgid "Specifications:"
+#~ msgstr "Specyfikacje:"
-#~ msgid "Wanted:"
-#~ msgstr "Pożądane:"
+#~ msgid "Where:"
+#~ msgstr "Gdzie:"
diff --git a/polish/po/partners.pl.po b/polish/po/partners.pl.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/polish/po/partners.pl.po
+++ b/polish/po/partners.pl.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/polish/po/stats.pl.po b/polish/po/stats.pl.po
index d341ec36094..f8fd3e52c36 100644
--- a/polish/po/stats.pl.po
+++ b/polish/po/stats.pl.po
@@ -20,79 +20,90 @@ msgstr "Jest %d bajtów do przetłumaczenia."
msgid "There are %d strings to translate."
msgstr "Jest %d napisów do przetłumaczenia."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "To tłumaczenie jest przestarzałe."
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Nieprawidłowa wersja tłumaczenia"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "To tłumaczenie jest przestarzałe."
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Oryginał jest nowszy niż to tłumaczenie"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Oryginał już nie istnieje"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "liczba odwiedzin nie dostępna"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "odwiedzin(y)"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Kliknij by pobrać statystyki zmian"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Połączony diff"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Kolorowy diff"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Kolorowy diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Podsumowanie tłumaczeń dla"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Nie przetłumaczone"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Zdezaktualizowane"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Przetłumaczone"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Aktualne"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "plików"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bajtów"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -100,131 +111,131 @@ msgstr ""
"Uwaga: lista stron jest posortowana według popularności. Najedź wskaźnikiem "
"nad nazwę strony aby zobaczyć liczbę odwiedzin."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Zdezaktualizowane tłumaczenia"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Plik"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Komentarz"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Dziennik"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Tłumaczenie"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Opiekun"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Stan"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Tłumacz"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Nie przetłumaczone strony ogólne"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Przetłumaczone strony ogólne"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Nieprzetłumaczone wiadomości"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Nieprzetłumaczone wiadomości"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Nieprzetłumaczone strony konsultantów/użytkowników"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Nieprzetłumaczone strony konsultantów/użytkowników"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Nieprzetłumaczone strony poszczególnych języków"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Nieprzetłumaczone strony poszczególnych języków"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Przetłumaczone strony (aktualne)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Przetłumaczone szablony (pliki PO)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Statystyki tłumaczeń PO"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Fuzzy"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Nieprzetłumaczone"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Łącznie"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Łącznie:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Przetłumaczone strony"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Statystyki tłumaczeń według ilości stron"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Język"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Tłumaczenia"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Przetłumaczone strony (według rozmiaru)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Statystyki tłumaczeń według wielkości strony"
diff --git a/polish/po/templates.pl.po b/polish/po/templates.pl.po
index 3bb91668577..db3676357e5 100644
--- a/polish/po/templates.pl.po
+++ b/polish/po/templates.pl.po
@@ -206,11 +206,11 @@ msgstr "w wersji 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Aby zgłosić problem ze stroną WWW, prześlij wiadomość po angielsku na <a "
"href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a> "
@@ -512,6 +512,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Uwaga:</em> Oryginalny dokument tego tłumaczenia już nie istnieje."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "Adres internetowy"
diff --git a/polish/po/vendors.pl.po b/polish/po/vendors.pl.po
index 09d76629f13..ae8cdcd207a 100644
--- a/polish/po/vendors.pl.po
+++ b/polish/po/vendors.pl.po
@@ -68,29 +68,29 @@ msgstr "źródła"
msgid "and"
msgstr "i"
-#~ msgid "Architectures:"
-#~ msgstr "Architektury:"
+#~ msgid "Vendor:"
+#~ msgstr "Dystrybutor:"
-#~ msgid "DVD Type:"
-#~ msgstr "Typ płyty DVD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Adres strony na temat płyt Debiana:"
-#~ msgid "CD Type:"
-#~ msgstr "Typ płyty:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Umożliwia przekazywanie darów Debianowi:"
-#~ msgid "email:"
-#~ msgstr "email:"
+#~ msgid "Country:"
+#~ msgstr "Kraj:"
#~ msgid "Ship International:"
#~ msgstr "Sprzedaje za granicę:"
-#~ msgid "Country:"
-#~ msgstr "Kraj:"
+#~ msgid "email:"
+#~ msgstr "email:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Umożliwia przekazywanie darów Debianowi:"
+#~ msgid "CD Type:"
+#~ msgstr "Typ płyty:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Adres strony na temat płyt Debiana:"
+#~ msgid "DVD Type:"
+#~ msgstr "Typ płyty DVD:"
-#~ msgid "Vendor:"
-#~ msgstr "Dystrybutor:"
+#~ msgid "Architectures:"
+#~ msgstr "Architektury:"
diff --git a/portuguese/po/blends.pt.po b/portuguese/po/blends.pt.po
index 2f723e8808e..efd78e4ceb3 100644
--- a/portuguese/po/blends.pt.po
+++ b/portuguese/po/blends.pt.po
@@ -29,13 +29,26 @@ msgstr "Derivadas"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"O objetivo da Debian Astro é desenvolver um sistema operacional baseado no "
+"Debian que atenda às necessidades tanto de astrônomos profissionais quanto "
+"de hobistas. Ela integra uma grande quantidade de pacotes de software "
+"abrangendo controle de telescópio, redução de dados, apresentação e outras "
+"áreas."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"O objetivo de DebiChem é fazer do Debian uma boa plataforma para químicos em "
"seus trabalhos diários"
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
#, fuzzy
#| msgid ""
#| "The goal of Debian Games is to provide games in Debian from arcade and "
@@ -47,7 +60,7 @@ msgstr ""
"O objetivo da Debian Games é disponibilizar jogos no Debian desde árcade e "
"aventura até simulação e estratégia."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -55,7 +68,7 @@ msgstr ""
"O objetivo da Debian Edu é disponibilizar um sistema operacional Debian "
"adequado para uso educacional e em escolas."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -63,7 +76,7 @@ msgstr ""
"O objetivo da Debian GIS é transformar o Debian na melhor distribuição para "
"aplicações e usuários de Sistemas de Informações Geográficas."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -71,7 +84,7 @@ msgstr ""
"O objetivo da Debian Junior é fazer do Debian um sistema operacional que as "
"crianças gostem de usar."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -84,7 +97,7 @@ msgstr ""
"imagem médica, bioinformática, infraestrutura de TI clínica e outros no "
"sistema operacional Debian."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -92,7 +105,7 @@ msgstr ""
"O objetivo da Debian Multimedia é fazer do Debian uma boa plataforma para "
"trabalhos com áudio e multimídia."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -112,26 +125,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"O objetivo da Debian Astro é desenvolver um sistema operacional baseado no "
-"Debian que atenda às necessidades tanto de astrônomos profissionais quanto "
-"de hobistas. Ela integra uma grande quantidade de pacotes de software "
-"abrangendo controle de telescópio, redução de dados, apresentação e outras "
-"áreas."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"O objetivo da Debian Design é disponibilizar aplicações para designers. Isso "
"inclui design gráfico, design web e design multimídia."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -146,7 +146,7 @@ msgstr ""
"construção e desenvolvimento de tecnologia em muitas áreas e regiões, como "
"África, Afeganistão, Indonésia e Vietnã utilizando o Debian."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -160,7 +160,7 @@ msgstr ""
"retransmissor Tor no dispositivo, que pode substituir um roteador sem fio "
"para que os dados permaneçam com os usuários."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -169,7 +169,7 @@ msgstr ""
"no Debian, disponibilizando aplicações de registro, modo de dados ou de "
"pacote, entre outras."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -178,8 +178,8 @@ msgstr ""
"necessidades dos parlamentares, políticos e seus funcionários ao redor do "
"mundo."
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian Accessibility"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games"
diff --git a/portuguese/po/bugs.pt.po b/portuguese/po/bugs.pt.po
index 805acf5ebaf..2f781c8d11a 100644
--- a/portuguese/po/bugs.pt.po
+++ b/portuguese/po/bugs.pt.po
@@ -164,152 +164,152 @@ msgstr "Arquivados"
msgid "Archived and Unarchived"
msgstr "Arquivados e Desarquivados"
-#~ msgid "Exclude tag:"
-#~ msgstr "Excluir tag:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Incluir tag:"
+#~ msgid "Flags:"
+#~ msgstr "Flags:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "bugs ativos"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "exibir bugs mesclados apenas uma vez"
-#~ msgid "wontfix"
-#~ msgstr "não corrigir (wontfix)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "não ordenar por estado ou severidade"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "não exibir a tabela de conteúdo no cabeçalho"
-#~ msgid "unreproducible"
-#~ msgstr "não reproduzível (unreproducible)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "não exibir estatísticas no rodapé"
-#~ msgid "security"
-#~ msgstr "segurança (security)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "mais informações (moreinfo)"
+#~ msgid "Package version:"
+#~ msgstr "Versão do pacote:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Distribuição:"
-#~ msgid "help"
-#~ msgstr "ajuda (help)"
+#~ msgid "bugs"
+#~ msgstr "bugs"
-#~ msgid "fixed-upstream"
-#~ msgstr "corrigido-upstream (fixed-upstream)"
+#~ msgid "open"
+#~ msgstr "aberto (open)"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "corrigido-na-experimental"
+#~ msgid "forwarded"
+#~ msgstr "encaminhado (forwarded)"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "pendente (pending)"
-#~ msgid "confirmed"
-#~ msgstr "confirmado"
+#~ msgid "fixed"
+#~ msgstr "corrigido (fixed)"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "feito (done)"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Incluir estado:"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Excluir estado:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "crítico (critical)"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "grave (grave)"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "sério (serious)"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "importante (important)"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "menor (minor)"
-#~ msgid "Exclude severity:"
-#~ msgstr "Excluir severidade:"
+#~ msgid "wishlist"
+#~ msgstr "sugestão (wishlist)"
#~ msgid "Include severity:"
#~ msgstr "Incluir severidade:"
-#~ msgid "wishlist"
-#~ msgstr "sugestão (wishlist)"
+#~ msgid "Exclude severity:"
+#~ msgstr "Excluir severidade:"
-#~ msgid "minor"
-#~ msgstr "menor (minor)"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "important"
-#~ msgstr "importante (important)"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "serious"
-#~ msgstr "sério (serious)"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "grave"
-#~ msgstr "grave (grave)"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "critical"
-#~ msgstr "crítico (critical)"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Excluir estado:"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "Include status:"
-#~ msgstr "Incluir estado:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "done"
-#~ msgstr "feito (done)"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "corrigido (fixed)"
+#~ msgid "confirmed"
+#~ msgstr "confirmado"
-#~ msgid "pending"
-#~ msgstr "pendente (pending)"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "encaminhado (forwarded)"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "corrigido-na-experimental"
-#~ msgid "open"
-#~ msgstr "aberto (open)"
+#~ msgid "fixed-upstream"
+#~ msgstr "corrigido-upstream (fixed-upstream)"
-#~ msgid "bugs"
-#~ msgstr "bugs"
+#~ msgid "help"
+#~ msgstr "ajuda (help)"
-#~ msgid "Distribution:"
-#~ msgstr "Distribuição:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Versão do pacote:"
+#~ msgid "moreinfo"
+#~ msgstr "mais informações (moreinfo)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "segurança (security)"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "não exibir estatísticas no rodapé"
+#~ msgid "unreproducible"
+#~ msgstr "não reproduzível (unreproducible)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "não exibir a tabela de conteúdo no cabeçalho"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "não ordenar por estado ou severidade"
+#~ msgid "wontfix"
+#~ msgstr "não corrigir (wontfix)"
-#~ msgid "display merged bugs only once"
-#~ msgstr "exibir bugs mesclados apenas uma vez"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "bugs ativos"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Flags:"
+#~ msgid "Include tag:"
+#~ msgstr "Incluir tag:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Excluir tag:"
diff --git a/portuguese/po/distrib.pt.po b/portuguese/po/distrib.pt.po
index cdcebefcc67..44b98e21198 100644
--- a/portuguese/po/distrib.pt.po
+++ b/portuguese/po/distrib.pt.po
@@ -208,53 +208,53 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "pacotes que contêm arquivos ou diretórios com este nome"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "todos os arquivos neste pacote"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Diferenciar maiúsculas e minúsculas"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "não"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "sim"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "KFreeBSD (Intel x86)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Permitir pesquisa em sub-palavras"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Search case sensitive"
+#~ msgstr "Pesquisa diferenciando maiúsculas e minúsculas"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "non-US"
+#~ msgstr "não-US"
#~ msgid "MIPS (DEC)"
#~ msgstr "MIPS (DEC)"
-#~ msgid "non-US"
-#~ msgstr "não-US"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Search case sensitive"
-#~ msgstr "Pesquisa diferenciando maiúsculas e minúsculas"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Permitir pesquisa em sub-palavras"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "KFreeBSD (Intel x86)"
-#~ msgid "yes"
-#~ msgstr "sim"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "no"
-#~ msgstr "não"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Case sensitive"
-#~ msgstr "Diferenciar maiúsculas e minúsculas"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "all files in this package"
-#~ msgstr "todos os arquivos neste pacote"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "pacotes que contêm arquivos ou diretórios com este nome"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/portuguese/po/doc.pt.po b/portuguese/po/doc.pt.po
index 4e791264151..f2e38560b6d 100644
--- a/portuguese/po/doc.pt.po
+++ b/portuguese/po/doc.pt.po
@@ -65,8 +65,8 @@ 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:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
#, fuzzy
#| msgid ""
#| "Written by two Debian developers, this free book\n"
@@ -121,43 +121,7 @@ msgstr ""
" sistema por conta própria (seja em casa, no escritório, no clube ou na\n"
" escola)."
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 arquitetura ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-"Este livro é para desenvolvedores que trabalham com GNU/Linux em\n"
-" processadores ARM. Ele cobre alguns dispositivos especificamente para\n"
-" configuração rápida (LART, Assabet, Psion5). Ele também dá informações\n"
-" genéricas, ferramentas e técnicas. O toolchain GNU é coberto nas formas\n"
-" nativa e inter-compilador assim como os carregadores de inicialização,\n"
-" patches de kernel, RAMdisks, peculiaridades da ARM e outros recursos da\n"
-" ARM. Ele também inclui tutorial extensivo de informações sobre o básico\n"
-" do GNU/Linux para desenvolvedores vindos de outras plataformas.\n"
-" Ele não é específico do Debian, mas a distribuição Aleph ARMLinux é\n"
-" altamente baseada no Debian-ARM e é assumido que você esteja\n"
-" trabalhando nessa distribuição e preferivelmente tenha uma máquina host\n"
-" baseada no Debian também."
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -177,7 +141,7 @@ msgstr ""
" Debian e o administrador que quer construir uma rede confiável com o \n"
" Debian."
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
#, fuzzy
#| msgid ""
#| "The book covers topics ranging from concepts of package \n"
@@ -207,7 +171,7 @@ msgstr ""
"prevista \n"
" a versão impressa.\n"
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
#, fuzzy
#| msgid ""
#| "This book teaches you how to install and configure the system and also "
@@ -227,6 +191,22 @@ msgstr ""
"manual for all users who want to learn more about Debian and its range of "
"services."
+#: ../../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 "Autor:"
@@ -279,13 +259,13 @@ msgstr "(versão <get-var version />)"
msgid "plain text"
msgstr "texto puro"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"O código <get-var srctype /> fonte mais recente está disponível através do "
-"repositório <a href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+"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
@@ -314,14 +294,6 @@ msgstr ""
"repositório <a href=\"https://packages.debian.org/subversion\">Subversion</"
"a>."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"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:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -353,194 +325,116 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Use o <a href=\"cvs\">SVN</a> para baixar o fonte SGML do <get-var "
-#~ "ddp_pkg_loc />."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "Sarge CD com instalador e uma seleção de pacotes"
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "Uma <a\n"
-#~ " href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
-#~ "titnr=242485044\">\n"
-#~ " publicação</a> alternativa está disponível pelo Lehmanns "
-#~ "Fachbuchhandlung e\n"
-#~ " custa 29.95 &euro; (a partir de 2008)."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live CD com Knoppix"
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Este é o livro certo para você aprender como criar plataformas de TI "
-#~ "básicas e complexas usando apenas Software Livre. Nele você encontrará "
-#~ "uma grande variedade de procedimentos revisados e ajustados de acordo com "
-#~ "as melhores práticas de implementação de infra-estrutura tecnológica. "
-#~ "Este guia abrangente e de fácil leitura irá levá-lo pela mão para atingir "
-#~ "objetivos específicos com o sistema operacional Debian GNU/Linux."
+#~ "Usuários iniciantes e avançados encontrarão neste livro uma fonte\n"
+#~ " de informações sobre o uso do Debian para desktops, servidores de\n"
+#~ " intranet e internet e desenvolvimento. Ele também contém informações\n"
+#~ " sobre a história do projeto e uma cobertura extensiva sobre o sistema\n"
+#~ " de gerenciamento de pacotes único do Debian."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Este livro está dividido em quatro partes: Conceitos básicos, Gerência\n"
-#~ " do GNU/Linux, Administração do sistema e Operações avançadas. Cada\n"
-#~ " capítulo foi elaborado de forma a explicar, detalhadamente, como o\n"
-#~ " sistema operacional funciona. Os capítulos iniciais estão voltados "
-#~ "para\n"
-#~ " o entendimento da estrutura do GNU/Linux. Esses capítulos ajudarão o\n"
-#~ " leitor a entender como o sistema utiliza recursos básicos, como\n"
-#~ " processador e memória. Análises detalhadas sobre os principais "
-#~ "sistemas\n"
-#~ " de arquivos, como Ext2, Ext3 e ReiserFS, foram incluídas para que o\n"
-#~ " usuário tenha condições de fazer a escolha correta, de acordo com as\n"
-#~ " suas necessidades. Diversos gráficos espalhados pelo livro mostram\n"
-#~ " aspectos referentes ao desempenho do sistema. Este livro é destinado a\n"
-#~ " universitários, nos níveis de graduação e pós-graduação, e autodidatas\n"
-#~ " que desejam aprender sobre o GNU/Linux com profundidade. Este livro\n"
-#~ " utiliza o Debian Sarge."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "Debian GNU/Linux 3.1r0a sarge Oficial em DVD (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "O primeiro livro persa sobre Debian GNU/Linux. Este livro irá ajudá-lo\n"
-#~ " a instalar o Debian GNU/Linux e configurar serviços de rede como web, "
-#~ "banco\n"
-#~ " de dados, firewall, correio, ftp, etc. Ele também irá ajudá-lo a "
-#~ "iniciar-se\n"
-#~ " na utilização do GNU/Linux e do poderoso sistema de gerenciamento de "
-#~ "pacotes\n"
-#~ " do Debian."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Este livro introduz os conceitos e técnicas do sistema operacional\n"
+#~ " Debian, explicando quais suas utilizações e defeitos, e ilustrando\n"
+#~ " o modo de pensar por trás de cada abordagem. O objetivo não é servir\n"
+#~ " como um livro de referência, mas fornecer ao leitor uma visão ampla\n"
+#~ " sobre o funcionamento do projeto e do sistema operacional, de forma\n"
+#~ " que ele aprenda e adote as soluções elegantes e sofisticadas, algumas\n"
+#~ " vezes um pouco não-intuitivas no começo, que evoluíram como parte do\n"
+#~ " sistema Debian ao longo da última década. Embora direcionado aos\n"
+#~ " administradores de sistemas UNIX/Linux mais experientes, o livro\n"
+#~ " também serve como um excelente recurso para acompanhar um guia de\n"
+#~ " referência Linux padrão e alavancar a experiência Linux de um usuário\n"
+#~ " com a filosofia <q>bottom-up</q> do Debian."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Este livro introduz os leitores ao Debian GNU/Linux com muitas dicas e\n"
-#~ " tutoriais úteis. Escrito em coreano, ele cobre aspectos compreensivos\n"
-#~ " do sistema Debian GNU/Linux: configuração inicial, instalação de "
-#~ "pacotes,\n"
-#~ " configuração do X, conexão à Internet, manutenção de redes e mais.\n"
-#~ " Este livro fornece uma mão cheia de dicas na configuração do Debian "
-#~ "para o\n"
-#~ " ambiente de idioma coreano e é bom para iniciantes também."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Três CDs oficiais do potato r3 e um CD não-oficial do woody"
+#~ "Um guia de referência muito útil para o sistema Debian GNU/Linux que\n"
+#~ " mostra, em mais de 1.500 <q>receitas</q>, como usá-lo para as "
+#~ "atividades\n"
+#~ " do dia-a-dia -- de trabalhar com texto, imagens, e sons até "
+#~ "produtividade\n"
+#~ " e temas de rede. Assim como o software que o livro descreve, o livro "
+#~ "está\n"
+#~ " sob copyleft e seu código fonte está disponível."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Esse livro é um guia breve para a instalação do Debian GNU/Linux,\n"
-#~ " fundamentos dos comandos Unix ou GNU/Linux, configuração básica e\n"
-#~ " manutenção do sistema e da rede, configuração do X Window System\n"
-#~ " e uso de multimídia no Debian GNU/Linux.\n"
-#~ " Esse livro também cobre o guia do mantenedor, que estimula\n"
-#~ " pessoas da Coréia a se tornarem desenvolvedores oficiais do Debian."
+#~ "O Learning Debian GNU/Linux guia o novo usuário do GNU/Linux pela "
+#~ "instalação\n"
+#~ " e configuração do Debian GNU/Linux.\n"
+#~ " Usuários de Windows ganham uma introdução boa a esse mundo excitante "
+#~ "da\n"
+#~ " computação guiados por Bill McCarty no <q>Learning Debian GNU/Linux</q>."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 Woody não oficial, 3 Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Esse livro cobre tópicos em geral sobre o Debian GNU/Linux:\n"
-#~ " instalação, APT e dpkg, shell, X Window System, redes, administração\n"
-#~ " de sistemas, configuração de kernel, compartilhamento com Windows,\n"
-#~ " construção de servidores e assim por diante.\n"
-#~ " Você estará apto a instalar e começar a usar o Debian GNU/Linux com\n"
-#~ " ambiente em japonês muito facilmente com os CDs personalizados."
+#~ "Inclui 230+ páginas e três discos de CD-ROM. Os tópicos cobertos\n"
+#~ " por software incluem Debian GNU/Linux, rede, ferramentas de "
+#~ "programação,\n"
+#~ " GUI, desktop publishing, negócios, coisas divertidas e multimídia.\n"
+#~ " 30 dias de suporte gratuito por e-mail incluídos."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 edição do autor (3 CDs)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Este é o último livro para o Sarge da série que tem sido considerada "
-#~ "como\n"
-#~ " a bíblia padrão do Debian no Japão. O livro aborda todos os aspectos "
-#~ "de\n"
-#~ " utilização do Debian GNU/Linux 3.1 Sarge, como instalação, ambientes "
-#~ "de\n"
-#~ " área de trabalho, administração de sistemas e configuração de "
-#~ "servidores.\n"
-#~ " Além disso, ele também inclui pacotes comerciais de fontes para "
-#~ "decorar\n"
-#~ " sua área de trabalho. Este livro pode ser útil para todos os tipos de\n"
-#~ " usuários Debian, do básico ao avançado."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 edições: Uma sem um DVD, e outra com 2 DVDs (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, edição do autor (DVD + CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) em DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Este livro utiliza o formato de um dicionário e contém várias dicas para\n"
-#~ " usuários iniciantes e de nível intermediário; os diversos modos de\n"
-#~ " instalação, personalização de áreas de trabalho, resolução de "
-#~ "problemas,\n"
-#~ " práticas produtivas e assim por diante."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "instalador do Debian GNU/Linux 3.1 Sarge (single-width CD)"
+#~ "2 edições: Uma sem CD, a outra com o CD Oficial CD (i386, contrib e "
+#~ "fontes)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -578,113 +472,237 @@ msgstr "PDF"
#~ "chamadas\n"
#~ " ou um servidor para clientes baseados em Windows (SAMBA)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "instalador do Debian GNU/Linux 3.1 Sarge (single-width CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "2 edições: Uma sem CD, a outra com o CD Oficial CD (i386, contrib e "
-#~ "fontes)"
+#~ "Este livro utiliza o formato de um dicionário e contém várias dicas para\n"
+#~ " usuários iniciantes e de nível intermediário; os diversos modos de\n"
+#~ " instalação, personalização de áreas de trabalho, resolução de "
+#~ "problemas,\n"
+#~ " práticas produtivas e assim por diante."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) em DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, edição do autor (DVD + CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 edições: Uma sem um DVD, e outra com 2 DVDs (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Este é o último livro para o Sarge da série que tem sido considerada "
+#~ "como\n"
+#~ " a bíblia padrão do Debian no Japão. O livro aborda todos os aspectos "
+#~ "de\n"
+#~ " utilização do Debian GNU/Linux 3.1 Sarge, como instalação, ambientes "
+#~ "de\n"
+#~ " área de trabalho, administração de sistemas e configuração de "
+#~ "servidores.\n"
+#~ " Além disso, ele também inclui pacotes comerciais de fontes para "
+#~ "decorar\n"
+#~ " sua área de trabalho. Este livro pode ser útil para todos os tipos de\n"
+#~ " usuários Debian, do básico ao avançado."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edição do autor (3 CDs)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Inclui 230+ páginas e três discos de CD-ROM. Os tópicos cobertos\n"
-#~ " por software incluem Debian GNU/Linux, rede, ferramentas de "
-#~ "programação,\n"
-#~ " GUI, desktop publishing, negócios, coisas divertidas e multimídia.\n"
-#~ " 30 dias de suporte gratuito por e-mail incluídos."
+#~ "Esse livro cobre tópicos em geral sobre o Debian GNU/Linux:\n"
+#~ " instalação, APT e dpkg, shell, X Window System, redes, administração\n"
+#~ " de sistemas, configuração de kernel, compartilhamento com Windows,\n"
+#~ " construção de servidores e assim por diante.\n"
+#~ " Você estará apto a instalar e começar a usar o Debian GNU/Linux com\n"
+#~ " ambiente em japonês muito facilmente com os CDs personalizados."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 Woody não oficial, 3 Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "O Learning Debian GNU/Linux guia o novo usuário do GNU/Linux pela "
-#~ "instalação\n"
-#~ " e configuração do Debian GNU/Linux.\n"
-#~ " Usuários de Windows ganham uma introdução boa a esse mundo excitante "
-#~ "da\n"
-#~ " computação guiados por Bill McCarty no <q>Learning Debian GNU/Linux</q>."
+#~ "Esse livro é um guia breve para a instalação do Debian GNU/Linux,\n"
+#~ " fundamentos dos comandos Unix ou GNU/Linux, configuração básica e\n"
+#~ " manutenção do sistema e da rede, configuração do X Window System\n"
+#~ " e uso de multimídia no Debian GNU/Linux.\n"
+#~ " Esse livro também cobre o guia do mantenedor, que estimula\n"
+#~ " pessoas da Coréia a se tornarem desenvolvedores oficiais do Debian."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Três CDs oficiais do potato r3 e um CD não-oficial do woody"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Um guia de referência muito útil para o sistema Debian GNU/Linux que\n"
-#~ " mostra, em mais de 1.500 <q>receitas</q>, como usá-lo para as "
-#~ "atividades\n"
-#~ " do dia-a-dia -- de trabalhar com texto, imagens, e sons até "
-#~ "produtividade\n"
-#~ " e temas de rede. Assim como o software que o livro descreve, o livro "
-#~ "está\n"
-#~ " sob copyleft e seu código fonte está disponível."
+#~ "Este livro introduz os leitores ao Debian GNU/Linux com muitas dicas e\n"
+#~ " tutoriais úteis. Escrito em coreano, ele cobre aspectos compreensivos\n"
+#~ " do sistema Debian GNU/Linux: configuração inicial, instalação de "
+#~ "pacotes,\n"
+#~ " configuração do X, conexão à Internet, manutenção de redes e mais.\n"
+#~ " Este livro fornece uma mão cheia de dicas na configuração do Debian "
+#~ "para o\n"
+#~ " ambiente de idioma coreano e é bom para iniciantes também."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Este livro introduz os conceitos e técnicas do sistema operacional\n"
-#~ " Debian, explicando quais suas utilizações e defeitos, e ilustrando\n"
-#~ " o modo de pensar por trás de cada abordagem. O objetivo não é servir\n"
-#~ " como um livro de referência, mas fornecer ao leitor uma visão ampla\n"
-#~ " sobre o funcionamento do projeto e do sistema operacional, de forma\n"
-#~ " que ele aprenda e adote as soluções elegantes e sofisticadas, algumas\n"
-#~ " vezes um pouco não-intuitivas no começo, que evoluíram como parte do\n"
-#~ " sistema Debian ao longo da última década. Embora direcionado aos\n"
-#~ " administradores de sistemas UNIX/Linux mais experientes, o livro\n"
-#~ " também serve como um excelente recurso para acompanhar um guia de\n"
-#~ " referência Linux padrão e alavancar a experiência Linux de um usuário\n"
-#~ " com a filosofia <q>bottom-up</q> do Debian."
+#~ "O primeiro livro persa sobre Debian GNU/Linux. Este livro irá ajudá-lo\n"
+#~ " a instalar o Debian GNU/Linux e configurar serviços de rede como web, "
+#~ "banco\n"
+#~ " de dados, firewall, correio, ftp, etc. Ele também irá ajudá-lo a "
+#~ "iniciar-se\n"
+#~ " na utilização do GNU/Linux e do poderoso sistema de gerenciamento de "
+#~ "pacotes\n"
+#~ " do Debian."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Debian GNU/Linux 3.1r0a sarge Oficial em DVD (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Este livro está dividido em quatro partes: Conceitos básicos, Gerência\n"
+#~ " do GNU/Linux, Administração do sistema e Operações avançadas. Cada\n"
+#~ " capítulo foi elaborado de forma a explicar, detalhadamente, como o\n"
+#~ " sistema operacional funciona. Os capítulos iniciais estão voltados "
+#~ "para\n"
+#~ " o entendimento da estrutura do GNU/Linux. Esses capítulos ajudarão o\n"
+#~ " leitor a entender como o sistema utiliza recursos básicos, como\n"
+#~ " processador e memória. Análises detalhadas sobre os principais "
+#~ "sistemas\n"
+#~ " de arquivos, como Ext2, Ext3 e ReiserFS, foram incluídas para que o\n"
+#~ " usuário tenha condições de fazer a escolha correta, de acordo com as\n"
+#~ " suas necessidades. Diversos gráficos espalhados pelo livro mostram\n"
+#~ " aspectos referentes ao desempenho do sistema. Este livro é destinado a\n"
+#~ " universitários, nos níveis de graduação e pós-graduação, e autodidatas\n"
+#~ " que desejam aprender sobre o GNU/Linux com profundidade. Este livro\n"
+#~ " utiliza o Debian Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Usuários iniciantes e avançados encontrarão neste livro uma fonte\n"
-#~ " de informações sobre o uso do Debian para desktops, servidores de\n"
-#~ " intranet e internet e desenvolvimento. Ele também contém informações\n"
-#~ " sobre a história do projeto e uma cobertura extensiva sobre o sistema\n"
-#~ " de gerenciamento de pacotes único do Debian."
+#~ "Este é o livro certo para você aprender como criar plataformas de TI "
+#~ "básicas e complexas usando apenas Software Livre. Nele você encontrará "
+#~ "uma grande variedade de procedimentos revisados e ajustados de acordo com "
+#~ "as melhores práticas de implementação de infra-estrutura tecnológica. "
+#~ "Este guia abrangente e de fácil leitura irá levá-lo pela mão para atingir "
+#~ "objetivos específicos com o sistema operacional Debian GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live CD com Knoppix"
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Uma <a\n"
+#~ " href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
+#~ "titnr=242485044\">\n"
+#~ " publicação</a> alternativa está disponível pelo Lehmanns "
+#~ "Fachbuchhandlung e\n"
+#~ " custa 29.95 &euro; (a partir de 2008)."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "Sarge CD com instalador e uma seleção de pacotes"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Use o <a href=\"cvs\">SVN</a> para baixar o fonte SGML do <get-var "
+#~ "ddp_pkg_loc />."
+
+#~ msgid "Language:"
+#~ msgstr "Idioma:"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "O código <get-var srctype /> fonte mais recente está disponível através "
+#~ "do repositório <a href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Este livro é para desenvolvedores que trabalham com GNU/Linux em\n"
+#~ " processadores ARM. Ele cobre alguns dispositivos especificamente para\n"
+#~ " configuração rápida (LART, Assabet, Psion5). Ele também dá informações\n"
+#~ " genéricas, ferramentas e técnicas. O toolchain GNU é coberto nas "
+#~ "formas\n"
+#~ " nativa e inter-compilador assim como os carregadores de inicialização,\n"
+#~ " patches de kernel, RAMdisks, peculiaridades da ARM e outros recursos "
+#~ "da\n"
+#~ " ARM. Ele também inclui tutorial extensivo de informações sobre o "
+#~ "básico\n"
+#~ " do GNU/Linux para desenvolvedores vindos de outras plataformas.\n"
+#~ " Ele não é específico do Debian, mas a distribuição Aleph ARMLinux é\n"
+#~ " altamente baseada no Debian-ARM e é assumido que você esteja\n"
+#~ " trabalhando nessa distribuição e preferivelmente tenha uma máquina "
+#~ "host\n"
+#~ " baseada no Debian também."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 arquitetura ARM"
diff --git a/portuguese/po/l10n.pt.po b/portuguese/po/l10n.pt.po
index 0e0709951b0..2fcab8efe5b 100644
--- a/portuguese/po/l10n.pt.po
+++ b/portuguese/po/l10n.pt.po
@@ -103,8 +103,8 @@ msgstr "Arquivos POT"
msgid "Hints for translators"
msgstr "Dicas para tradutores"
-#~ msgid "Translated templates"
-#~ msgstr "Modelos traduzidos"
-
#~ msgid "Original templates"
#~ msgstr "Modelo original"
+
+#~ msgid "Translated templates"
+#~ msgstr "Modelos traduzidos"
diff --git a/portuguese/po/mailinglists.pt.po b/portuguese/po/mailinglists.pt.po
index db6fd2460f6..efc24e1237a 100644
--- a/portuguese/po/mailinglists.pt.po
+++ b/portuguese/po/mailinglists.pt.po
@@ -139,9 +139,9 @@ msgstr "aberta"
msgid "closed"
msgstr "fechada"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Por favor, selecione as listas das quais você deseja desinscrever-se:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
diff --git a/portuguese/po/organization.pt.po b/portuguese/po/organization.pt.po
index 2595c41b1ee..f14584e23c2 100644
--- a/portuguese/po/organization.pt.po
+++ b/portuguese/po/organization.pt.po
@@ -80,22 +80,22 @@ msgid "Officers"
msgstr "Oficiais"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribuição"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Equipe de publicidade"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Suporte e Infra-estrutura"
@@ -112,180 +112,180 @@ msgstr "Líder"
msgid "Technical Committee"
msgstr "Comitê Técnico"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Secretário"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Projetos de Desenvolvimento"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Repositórios FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Assistentes FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Assistentes FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Equipe de Backports"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Pacotes Individuais"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Gerência de Lançamento"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Equipe de Lançamento"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Controle de Qualidade"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Equipe do Sistema de Instalação"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Notas de Lançamento"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Imagens de CDs"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produção"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infra-estrutura de auto-construção"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Equipe wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Administração de Buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Documentação"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de Pacotes Prospectivos e que necessitam de trabalho"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Equipe do Sistema \"Live\""
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Portes"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Configurações Especiais"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Laptops"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Sistemas embarcados/embutidos"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Contato de Imprensa"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Páginas Web"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Programa de extensão"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Projeto Debian Women"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Antiassédio"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "Comitê da DebConf"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Programa de Parcerias"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Coordenação de Doações de Hardware"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Suporte ao usuário"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Sistema de Acompanhamento de Bugs"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
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:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Recepção de Novos Mantenedores"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Gerentes de Contas Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -293,31 +293,31 @@ msgstr ""
"Para enviar uma mensagem privada para todos os DAMs, use a chave GPG "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantenedores do Chaveiro (Keyring) (PGP e GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Equipe de Segurança"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Página de Consultores"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Página de Vendedores de CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Política (Policy)"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Administração do Sistema"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -327,7 +327,7 @@ msgstr ""
"precisar que um determinado pacote seja instalado numa das máquinas do "
"Projeto."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -337,162 +337,180 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador do Diretório LDAP de Desenvolvedores"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Espelhos"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Mantenedor do DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Sistema de Acompanhamento de Pacotes"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Pedidos de uso da <a name=\"trademark\" href=\"m4_HOME/trademark\">marca</a>"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Administração do Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administração do Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian para crianças de 1 a 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian para prática e pesquisa médica"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian para educação"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian em escritórios legais"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian para pessoas com deficiências"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian para ciência e pesquisa relacionada"
-#~ msgid "Publicity"
-#~ msgstr "Publicidade"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian para educação"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr ""
-#~ "Mantenedores do Chaveiro (Keyring) de Mantenedores Debian (Debian "
-#~ "Maintainer)"
+#~ msgid "Bits from Debian"
+#~ msgstr "Breves do Debian"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "atual Líder do Projeto Debian"
+#~ msgid "DebConf chairs"
+#~ msgstr "Presidentes da DebConf"
-#~ msgid "Testing Security Team"
-#~ msgstr "Equipe de Segurança da Testing"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Não ativo: não foi lançado com o squeeze)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projeto de Auditoria de Segurança"
+#~ msgid "Volatile Team"
+#~ msgstr "Equipe da Volatile"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribuição Personalizada Debian"
+#~ msgid "Vendors"
+#~ msgstr "Distribuidores"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Equipe de Lançamento para ``estável'' (stable)"
+#~ msgid "APT Team"
+#~ msgstr "Equipe do APT"
-#~ msgid "Handhelds"
-#~ msgstr "Handhelds"
+#~ msgid "Release Assistants"
+#~ msgstr "Assistentes de Lançamento"
-#~ msgid "Marketing Team"
-#~ msgstr "Equipe de Marketing"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Assistentes de Lançamento para ``estável'' (stable)"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Os administradores responsáveis pelas buildds para uma arquitetura em "
-#~ "particular podem ser contatados em <genericemail arch@buildd.debian.org>, "
-#~ "por exemplo, <genericemail i386@buildd.debian.org>."
+#~ msgid "Release Wizard"
+#~ msgstr "Mago de Lançamento"
+
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribuição Debian Multimídia"
#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
#~ msgstr ""
-#~ "Nomes dos administradores das buildds também podem ser encontrados em <a "
-#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Escolha uma "
-#~ "arquitetura e a distribuição para ver as buildds disponíveis e seus "
-#~ "administradores."
+#~ "Este ainda não é um projeto interno oficial do Debian mas anunciou a "
+#~ "intenção de ser integrado."
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordenação de Assinatura de Chaves"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux para Computação Empresarial"
-#~ msgid "Accountant"
-#~ msgstr "Contador"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Sistema de Instalação para ``estável''"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "O Sistema Operacional Universal como seu Desktop"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Arquivos das Listas de Discussão"
#~ msgid "Debian for non-profit organisations"
#~ msgstr "Debian para organizações sem fins lucrativos"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Arquivos das Listas de Discussão"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "O Sistema Operacional Universal como seu Desktop"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Sistema de Instalação para ``estável''"
+#~ msgid "Accountant"
+#~ msgstr "Contador"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux para Computação Empresarial"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordenação de Assinatura de Chaves"
#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
#~ msgstr ""
-#~ "Este ainda não é um projeto interno oficial do Debian mas anunciou a "
-#~ "intenção de ser integrado."
+#~ "Nomes dos administradores das buildds também podem ser encontrados em <a "
+#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Escolha uma "
+#~ "arquitetura e a distribuição para ver as buildds disponíveis e seus "
+#~ "administradores."
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribuição Debian Multimídia"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Os administradores responsáveis pelas buildds para uma arquitetura em "
+#~ "particular podem ser contatados em <genericemail arch@buildd.debian.org>, "
+#~ "por exemplo, <genericemail i386@buildd.debian.org>."
-#~ msgid "Release Wizard"
-#~ msgstr "Mago de Lançamento"
+#~ msgid "Marketing Team"
+#~ msgstr "Equipe de Marketing"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Assistentes de Lançamento para ``estável'' (stable)"
+#~ msgid "Handhelds"
+#~ msgstr "Handhelds"
-#~ msgid "Release Assistants"
-#~ msgstr "Assistentes de Lançamento"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Equipe de Lançamento para ``estável'' (stable)"
-#~ msgid "APT Team"
-#~ msgstr "Equipe do APT"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribuição Personalizada Debian"
-#~ msgid "Vendors"
-#~ msgstr "Distribuidores"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projeto de Auditoria de Segurança"
-#~ msgid "Volatile Team"
-#~ msgstr "Equipe da Volatile"
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipe de Segurança da Testing"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Não ativo: não foi lançado com o squeeze)"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "atual Líder do Projeto Debian"
-#~ msgid "DebConf chairs"
-#~ msgstr "Presidentes da DebConf"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr ""
+#~ "Mantenedores do Chaveiro (Keyring) de Mantenedores Debian (Debian "
+#~ "Maintainer)"
-#~ msgid "Bits from Debian"
-#~ msgstr "Breves do Debian"
+#~ msgid "Publicity"
+#~ msgstr "Publicidade"
+
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
+
+#~ 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..a00b675c32c 100644
--- a/portuguese/po/others.pt.po
+++ b/portuguese/po/others.pt.po
@@ -336,69 +336,89 @@ msgstr "Versão"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Nome:"
+#~ msgid "Wanted:"
+#~ msgstr "Desejado:"
-#~ msgid "Company:"
-#~ msgstr "Companhia"
+#~ msgid "Who:"
+#~ msgstr "Quem:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Architecture:"
+#~ msgstr "Arquitetura:"
-#~ msgid "or"
-#~ msgstr "ou"
+#~ msgid "Specifications:"
+#~ msgstr "Especificação:"
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
+#~ msgid "Where:"
+#~ msgstr "Onde:"
-#~ msgid "Rates:"
-#~ msgstr "Preço:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Aguardando por Realocação"
+#~ msgid "Previous Talks:"
+#~ msgstr "Palestras Anteriores:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> consultores Debian listados em <total_country> países. "
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Inscrição em Listas de Discussão"
+#~ msgid "Location:"
+#~ msgstr "Localização:"
+
+#~ msgid "Topics:"
+#~ msgstr "Tópicos:"
+
+#~ msgid "rc1"
+#~ msgstr "rc1"
+
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
+
+#~ msgid "closed"
+#~ msgstr "fechada"
+
+#~ msgid "open"
+#~ msgstr "aberta"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Desinscrever"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr ""
+#~ "Por favor, selecione as listas das quais você deseja desinscrever-se:"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
#~ "Consulte a página das <a href=\"./#subunsub\">listas de discussão</a> "
-#~ "para obter informações sobre como inscrever-se usando o e-mail. Um <a "
-#~ "href=\"unsubscribe\">formulário de desinscrição via web</a> também está "
+#~ "para obter informações sobre como desinscrever-se usando o e-mail. Um <a "
+#~ "href=\"subscribe\">formulário para inscrição via web</a> também está "
#~ "disponível. "
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Desinscrição das listas de discussão"
+
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Note que a maioria das listas de discussão Debian são fóruns públicos. "
-#~ "Quaisquer mensagens enviadas para elas serão publicadas nos arquivos "
-#~ "públicos das listas de discussão e indexados por mecanismos de busca. "
-#~ "Você só deveria se inscrever numa lista de discussão Debian usando um "
-#~ "endereço de e-mail que você não se importa em tornar público."
+#~ "Por favor, respeite a <a href=\"./#ads\">política de propaganda das "
+#~ "listas de discussão Debian</a>."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
+#~ msgid "Clear"
+#~ msgstr "Limpar"
-#~ msgid "No description given"
-#~ msgstr "Nenhuma descrição dada"
+#~ msgid "Subscribe"
+#~ msgstr "Inscrição"
-#~ msgid "Moderated:"
-#~ msgstr "Moderada:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Seu endereço de e-mail:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Postagem de mensagens permitida apenas para pessoas inscritas."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "somente leitura, versão resumida (digest)"
+
+#~ msgid "Subscription:"
+#~ msgstr "Inscrição:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -406,86 +426,66 @@ msgstr "URL"
#~ "Somente mensagens assinadas por um desenvolvedor Debian serão aceitas "
#~ "nesta lista."
-#~ msgid "Subscription:"
-#~ msgstr "Inscrição:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "somente leitura, versão resumida (digest)"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Postagem de mensagens permitida apenas para pessoas inscritas."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Seu endereço de e-mail:"
+#~ msgid "Moderated:"
+#~ msgstr "Moderada:"
-#~ msgid "Subscribe"
-#~ msgstr "Inscrição"
+#~ msgid "No description given"
+#~ msgstr "Nenhuma descrição dada"
-#~ msgid "Clear"
-#~ msgstr "Limpar"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "Por favor, respeite a <a href=\"./#ads\">política de propaganda das "
-#~ "listas de discussão Debian</a>."
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Desinscrição das listas de discussão"
+#~ "Note que a maioria das listas de discussão Debian são fóruns públicos. "
+#~ "Quaisquer mensagens enviadas para elas serão publicadas nos arquivos "
+#~ "públicos das listas de discussão e indexados por mecanismos de busca. "
+#~ "Você só deveria se inscrever numa lista de discussão Debian usando um "
+#~ "endereço de e-mail que você não se importa em tornar público."
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
#~ "Consulte a página das <a href=\"./#subunsub\">listas de discussão</a> "
-#~ "para obter informações sobre como desinscrever-se usando o e-mail. Um <a "
-#~ "href=\"subscribe\">formulário para inscrição via web</a> também está "
+#~ "para obter informações sobre como inscrever-se usando o e-mail. Um <a "
+#~ "href=\"unsubscribe\">formulário de desinscrição via web</a> também está "
#~ "disponível. "
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr ""
-#~ "Por favor, selecione as listas das quais você deseja desinscrever-se:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Desinscrever"
-
-#~ msgid "open"
-#~ msgstr "aberta"
-
-#~ msgid "closed"
-#~ msgstr "fechada"
-
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
-
-#~ msgid "rc1"
-#~ msgstr "rc1"
-
-#~ msgid "Topics:"
-#~ msgstr "Tópicos:"
-
-#~ msgid "Location:"
-#~ msgstr "Localização:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Inscrição em Listas de Discussão"
-#~ msgid "Languages:"
-#~ msgstr "Idiomas:"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> consultores Debian listados em <total_country> países. "
-#~ msgid "Previous Talks:"
-#~ msgstr "Palestras Anteriores:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Aguardando por Realocação"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Rates:"
+#~ msgstr "Preço:"
-#~ msgid "Where:"
-#~ msgstr "Onde:"
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
-#~ msgid "Specifications:"
-#~ msgstr "Especificação:"
+#~ msgid "or"
+#~ msgstr "ou"
-#~ msgid "Architecture:"
-#~ msgstr "Arquitetura:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Who:"
-#~ msgstr "Quem:"
+#~ msgid "Company:"
+#~ msgstr "Companhia"
-#~ msgid "Wanted:"
-#~ msgstr "Desejado:"
+#~ msgid "Name:"
+#~ msgstr "Nome:"
diff --git a/portuguese/po/partners.pt.po b/portuguese/po/partners.pt.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/portuguese/po/partners.pt.po
+++ b/portuguese/po/partners.pt.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/portuguese/po/ports.pt.po b/portuguese/po/ports.pt.po
index 726f9f9ce03..45c1bda932b 100644
--- a/portuguese/po/ports.pt.po
+++ b/portuguese/po/ports.pt.po
@@ -122,138 +122,138 @@ msgstr "Debian para PowerPC"
msgid "Debian for Sparc"
msgstr "Debian para Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian para Laptops"
-
-#~ msgid "Vendor/Name"
-#~ msgstr "Vendedor/Nome"
-
-#~ msgid "Date announced"
-#~ msgstr "Data anunciada"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian para AMD64"
-#~ msgid "Clock"
-#~ msgstr "Relógio"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian para ARM"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian para Beowulf"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Main"
+#~ msgstr "Main (principal)"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian para Motorola 680x0"
-#~ msgid "Specials"
-#~ msgstr "Especiais"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian para MIPS"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Sem FPU (R2010), cache externo"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian para S/390"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Sem FPU (R3010)"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian para Sparc64"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Cache L1 indexado virtual, controlador de cache L2"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD baseado na libc5"
-#~ msgid "External L1 cache"
-#~ msgstr "Cache L1 externo"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, controlador LCD, Compact Flash, UART, Paralela, RTC, Teclado, "
+#~ "USB, Touchpad, Audio"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "CPU com múltiplos chips"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, Paralela, RTC, Audio, PCIC"
#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
#~ msgstr ""
-#~ "Extensão isa Mips16, Sem FPU, 512k flash, 12k ram, DMAC, UART, "
-#~ "Temporizador, I2C, Watchdog"
+#~ "Mips 16, RTC, Teclado, Painel sensível ao toque, Audio, Compact-Flash, "
+#~ "UART, Paralela"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr ""
-#~ "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador, I2C, Controlador LCD"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 cache L2 on die"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, PCIC, UART, Temporizador"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, barramento externo de 64 bits, cache L2"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Sem FPU, SDRAMC, ROMC, Temporizador, PCMCIA, Controlador LCD, IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, barramento externo de 64 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, Controlador LCD, IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, barramento externo de 32 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 E/S Digital"
#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
#~ msgstr "Sem FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Temporizador"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 E/S Digital"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, IrDA"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, barramento externo de 32 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, Controlador LCD, IrDA"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, barramento externo de 64 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Sem FPU, SDRAMC, ROMC, Temporizador, PCMCIA, Controlador LCD, IrDA"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, barramento externo de 64 bits, cache L2"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, PCIC, UART, Temporizador"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 cache L2 on die"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr ""
+#~ "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador, I2C, Controlador LCD"
#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
#~ msgstr ""
-#~ "Mips 16, RTC, Teclado, Painel sensível ao toque, Audio, Compact-Flash, "
-#~ "UART, Paralela"
+#~ "Extensão isa Mips16, Sem FPU, 512k flash, 12k ram, DMAC, UART, "
+#~ "Temporizador, I2C, Watchdog"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, Paralela, RTC, Audio, PCIC"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "CPU com múltiplos chips"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, controlador LCD, Compact Flash, UART, Paralela, RTC, Teclado, "
-#~ "USB, Touchpad, Audio"
+#~ msgid "External L1 cache"
+#~ msgstr "Cache L1 externo"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD baseado na libc5"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Cache L1 indexado virtual, controlador de cache L2"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian para Sparc64"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Sem FPU (R3010)"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian para S/390"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Sem FPU (R2010), cache externo"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian para MIPS"
+#~ msgid "Specials"
+#~ msgstr "Especiais"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian para Motorola 680x0"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Main"
-#~ msgstr "Main (principal)"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian para Beowulf"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian para ARM"
+#~ msgid "Clock"
+#~ msgstr "Relógio"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian para AMD64"
+#~ msgid "Date announced"
+#~ msgstr "Data anunciada"
+
+#~ msgid "Vendor/Name"
+#~ msgstr "Vendedor/Nome"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian para Laptops"
diff --git a/portuguese/po/stats.pt.po b/portuguese/po/stats.pt.po
index db5bfd7bec0..14b2983918e 100644
--- a/portuguese/po/stats.pt.po
+++ b/portuguese/po/stats.pt.po
@@ -31,79 +31,90 @@ msgstr "Existem %d bytes para traduzir."
msgid "There are %d strings to translate."
msgstr "Existem %d strings para traduzir."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Esta tradução está muito desatualizada"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Versão errada de tradução"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Esta tradução está muito desatualizada"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "O original é mais novo do que esta tradução"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "O original não existe mais"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "contagem de acesso N/A"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "acessos"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Clique para obter dados de diffstat"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "diff unificado"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "diff colorido"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "diff colorido"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Criado com <transstatslink>"
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Resumo de tradução para"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Não traduzidos"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Desatualizados"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Traduzidos"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Atualizados"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "arquivos"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -111,131 +122,131 @@ msgstr ""
"Nota: as listas das páginas são classificadas por popularidade. Passe o "
"mouse sobre o nome da página para ver o número de acessos."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Traduções desatualizadas"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Arquivo"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Comentário"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Tradução"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Mantenedor"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Tradutor"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Páginas gerais não traduzidas"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Páginas gerais não traduzidas"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Itens de notícias não traduzidos"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Itens de notícias não traduzidos"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Páginas de consultor/usuário não traduzidas"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Páginas de consultor/usuário não traduzidas"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Páginas internacionais não traduzidas"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Páginas internacionais não traduzidas"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Páginas traduzidas (atualidadas)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Templates traduzidos (arquivos PO)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Estatísticas de tradução de PO"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Imprecisos"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Não traduzidos"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Páginas web traduzidas"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Estatísticas de Tradução por Número de Página"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Idioma"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Traduções"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Páginas web traduzidas (por tamanho)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Estatísticas de Tradução por Tamanho de Página"
diff --git a/portuguese/po/templates.pt.po b/portuguese/po/templates.pt.po
index 3158b20fdf9..c220b48b672 100644
--- a/portuguese/po/templates.pt.po
+++ b/portuguese/po/templates.pt.po
@@ -213,11 +213,11 @@ msgstr "na versão 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Para relatar um problema com o site web, envie uma mensagem em inglês para "
"<a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</"
@@ -517,6 +517,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Nota:</em> O documento original desta tradução não existe mais."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -525,572 +529,572 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Voltar para <a href=\"../\">Quem está usando o Debian?</a>."
-#, fuzzy
-#~| msgid "Weekly News"
-#~ msgid "Weekly&nbsp;News"
-#~ msgstr "Notícias Semanais"
-
-#, fuzzy
-#~| msgid "Project News"
-#~ msgid "Project&nbsp;News"
-#~ msgstr "Notícias do Projeto"
-
-#~ msgid "Select a server near you"
-#~ msgstr "Escolha um servidor próximo de você"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Visite o patrocinador do site"
-#~ msgid "More information"
-#~ msgstr "Informações adicionais"
+#~ msgid "More information:"
+#~ msgstr "Mais informações:"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Próximas Atrações"
+#~ msgid "Taken by:"
+#~ msgstr "Tirado por:"
-#~ msgid "link may no longer be valid"
-#~ msgstr "o link pode não ser mais válido"
+#~ msgid "Nobody"
+#~ msgstr "Ninguém"
-#~ msgid "When"
-#~ msgstr "Quando"
+#~ msgid "Rating:"
+#~ msgstr "Classificação:"
-#~ msgid "Where"
-#~ msgstr "Onde"
+#~ msgid "List of Consultants"
+#~ msgstr "Lista de Consultores"
-#~ msgid "More Info"
-#~ msgstr "Mais Informações"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Voltar para a <a href=\"./\">página de consultores do Debian</a>."
-#~ msgid "Debian Involvement"
-#~ msgstr "Envolvimento do Debian"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordenador Principal"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Baixar com Jigdo"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordenador do</th><th>Projeto</th>"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Baixar via HTTP/FTP"
-#~ msgid "Related Links"
-#~ msgstr "Links Relacionados"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Comprar CDs ou DVDs"
-#~ msgid "Latest News"
-#~ msgstr "Últimas Notícias"
+#~ msgid "Network Install"
+#~ msgstr "Instalação via Rede"
-#~ msgid "Download calendar entry"
-#~ msgstr "Baixar entrada no calendário"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Baixar"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Voltar para: outras <a href=\"./\">notícias Debian</a> || <a href="
-#~ "\"m4_HOME/\">página inicial do Projeto Debian</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Misc"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (link quebrado)"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Arte gráfica"
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Para receber este boletim quinzenalmente em sua caixa postal, <a href="
-#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
-#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
-#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
-#~ "\">inscreva-se na lista debian-news</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Espelhando"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Edições anteriores</a> deste boletim estão disponíveis."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Espelhos Rsync"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />As Notícias do Projeto Debian são editadas por <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Baixar com Torrent"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />As Notícias do Projeto Debian são editadas por <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Informações sobre o Lançamento da Imagem"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edição das Notícias do Projeto Debian foi "
-#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Equipe Debian CD"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Esta edição das Notícias do Projeto Debian foi "
-#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_em_cd"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Ela foi traduzida por %s."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Ela foi traduzida por %s."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Ela foi traduzida por %s."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Ela foi traduzida por %s."
+#~ msgid "buy"
+#~ msgstr "compre"
-#~ msgid "List of Speakers"
-#~ msgstr "Lista de Palestrantes"
+#~ msgid "net_install"
+#~ msgstr "net_install"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Voltar para a <a href=\"./\">página de palestrantes do Debian</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />misc"
#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Para receber este boletim semanalmente em sua caixa postal, <a href="
-#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
-#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
-#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
-#~ "\">inscreva-se na lista debian-news</a>."
+#~ "<a href=\"/MailingLists/disclaimer\">Lista de discussão pública</a> em "
+#~ "inglês para CDs/DVDs:"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />As Notícias Semanais Debian são editadas por <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Date"
+#~ msgstr "Data"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />As Notícias Semanais Debian são editadas por <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Linha do Tempo"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edição das Notícias Semanais Debian foi "
-#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Candidaturas"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Esta edição das Notícias Semanais Debian foi "
-#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debate"
+#~ msgstr "Debate"
-#~ msgid "No requests for adoption"
-#~ msgstr "Nenhuma requisição para adoção"
+#~ msgid "Platforms"
+#~ msgstr "Plataformas"
-#~ msgid "No orphaned packages"
-#~ msgstr "Nenhum pacote órfão"
+#~ msgid "Proposer"
+#~ msgstr "Proponente"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Nenhum pacote esperando para ser adotado"
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Proponente da Proposta A"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Nenhum pacote esperando para ser empacotado"
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Proponente da Proposta B"
-#~ msgid "No Requested packages"
-#~ msgstr "Nenhum pacote requisitado"
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Proponente da Proposta C"
-#~ msgid "No help requested"
-#~ msgstr "Nenhuma ajuda requisitada"
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Proponente da Proposta D"
-#~ msgid "in adoption since today."
-#~ msgstr "em adoção desde hoje."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Proponente da Proposta E"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "em adoção desde ontem."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Proponente da Proposta F"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s dias em adoção."
+#~ msgid "Seconds"
+#~ msgstr "Padrinhos"
-#~ msgid "in preparation since today."
-#~ msgstr "em preparação desde hoje."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Padrinhos da Proposta A"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "em preparação desde ontem."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Padrinhos da Proposta B"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s dias em preparação."
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Padrinhos da Proposta C"
-#~ msgid "requested today."
-#~ msgstr "requisitado hoje."
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Padrinhos da Proposta D"
-#~ msgid "requested yesterday."
-#~ msgstr "requisitado ontem."
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Padrinhos da Proposta E"
-#~ msgid "requested %s days ago."
-#~ msgstr "requisitado a %s dias."
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Padrinhos da Proposta F"
-#~ msgid "package info"
-#~ msgstr "informações do pacote"
+#~ msgid "Opposition"
+#~ msgstr "Oposição"
-#~ msgid "License Information"
-#~ msgstr "Informações de Licença"
+#~ msgid "Text"
+#~ msgstr "Texto"
-#~ msgid "DLS Index"
-#~ msgstr "Índice DLS"
+#~ msgid "Proposal A"
+#~ msgstr "Proposta A"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Proposal B"
+#~ msgstr "Proposta B"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid "Proposal C"
+#~ msgstr "Proposta C"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Arquivo Debian-Legal"
+#~ msgid "Proposal D"
+#~ msgstr "Proposta D"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Proposal E"
+#~ msgstr "Proposta E"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Versão %s: %s"
+#~ msgid "Proposal F"
+#~ msgstr "Proposta F"
-#~ msgid "Date published"
-#~ msgstr "Data de publicação"
+#~ msgid "Choices"
+#~ msgstr "Opções"
-#~ msgid "License"
-#~ msgstr "Licença"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Proponente da Emenda"
-#~ msgid "Version"
-#~ msgstr "Versão"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Padrinhos da Emenda"
-#~ msgid "Summary"
-#~ msgstr "Sumário"
+#~ msgid "Amendment Text"
+#~ msgstr "Texto da Emenda"
-#~ msgid "Justification"
-#~ msgstr "Justificativa"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Proponente da Emenda A"
-#~ msgid "Discussion"
-#~ msgstr "Discussão"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Padrinhos da Emenda A"
-#~ msgid "Original Summary"
-#~ msgstr "Sumário Original"
+#~ msgid "Amendment Text A"
+#~ msgstr "Texto da Emenda A"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "O sumário original por <summary-author/> pode ser encontrado nos <a href="
-#~ "\"<summary-url/>\">arquivos da lista</a>."
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Proponente da Emenda B"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Este sumário foi preparado por <summary-author/>."
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Padrinhos da Emenda B"
-#~ msgid "License text (translated)"
-#~ msgstr "Texto da Licença (traduzido)"
+#~ msgid "Amendment Text B"
+#~ msgstr "Texto da Emenda B"
-#~ msgid "License text"
-#~ msgstr "Texto da Licença"
+#~ msgid "Amendments"
+#~ msgstr "Emendas"
-#~ msgid "free"
-#~ msgstr "livre"
+#~ msgid "Proceedings"
+#~ msgstr "Encaminhamentos"
-#~ msgid "non-free"
-#~ msgstr "não-livre"
+#~ msgid "Majority Requirement"
+#~ msgstr "Maioria Requerida"
-#~ msgid "not redistributable"
-#~ msgstr "não-redistribuível"
+#~ msgid "Data and Statistics"
+#~ msgstr "Dados e Estatísticas"
-#~ msgid "Free"
-#~ msgstr "Livre"
+#~ msgid "Quorum"
+#~ msgstr "Quorum"
-#~ msgid "Non-Free"
-#~ msgstr "Não-Livre "
+#~ msgid "Minimum Discussion"
+#~ msgstr "Discussão Mínima"
-#~ msgid "Not Redistributable"
-#~ msgstr "Não Redistribuível"
+#~ msgid "Ballot"
+#~ msgstr "Cédula"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Veja a página de <a href=\"./\">informação sobre licenças</a> para uma "
-#~ "visão geral dos Sumários de Licença Debian (DLS)."
+#~ msgid "Forum"
+#~ msgstr "Fórum"
-#~ msgid "buy pre-made images"
-#~ msgstr "compre imagens pré-feitas"
+#~ msgid "Outcome"
+#~ msgstr "Resultado"
-#~ msgid "network install"
-#~ msgstr "instalação via rede"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Aguardando&nbsp;Patrocinadores"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Voltar para outras <a href=\"./\">notícias Debian</a>."
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Em&nbsp;Discussão"
-#~ msgid "discussed"
-#~ msgstr "discutido"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Votação&nbsp;Aberta"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Kit de Pseudo Imagens"
+#~ msgid "Decided"
+#~ msgstr "Decidido"
-#~ msgid "Vote"
-#~ msgstr "Votar"
+#~ msgid "Withdrawn"
+#~ msgstr "Retirado"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Ler&nbsp;um&nbsp;Resultado"
+#~ msgid "Other"
+#~ msgstr "Outro"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Apoiar&nbsp;uma&nbsp;Proposta"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Página&nbsp;principal&nbsp;de&nbsp;Votação"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Corrigir&nbsp;uma&nbsp;Proposta"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Como Fazer"
#~ msgid "Submit&nbsp;a&nbsp;Proposal"
#~ msgstr "Enviar&nbsp;Proposta"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Como Fazer"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Corrigir&nbsp;uma&nbsp;Proposta"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Página&nbsp;principal&nbsp;de&nbsp;Votação"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Apoiar&nbsp;uma&nbsp;Proposta"
-#~ msgid "Other"
-#~ msgstr "Outro"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Ler&nbsp;um&nbsp;Resultado"
-#~ msgid "Withdrawn"
-#~ msgstr "Retirado"
+#~ msgid "Vote"
+#~ msgstr "Votar"
-#~ msgid "Decided"
-#~ msgstr "Decidido"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Kit de Pseudo Imagens"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Votação&nbsp;Aberta"
+#~ msgid "discussed"
+#~ msgstr "discutido"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Em&nbsp;Discussão"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Voltar para outras <a href=\"./\">notícias Debian</a>."
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Aguardando&nbsp;Patrocinadores"
+#~ msgid "network install"
+#~ msgstr "instalação via rede"
-#~ msgid "Outcome"
-#~ msgstr "Resultado"
+#~ msgid "buy pre-made images"
+#~ msgstr "compre imagens pré-feitas"
-#~ msgid "Forum"
-#~ msgstr "Fórum"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Veja a página de <a href=\"./\">informação sobre licenças</a> para uma "
+#~ "visão geral dos Sumários de Licença Debian (DLS)."
-#~ msgid "Ballot"
-#~ msgstr "Cédula"
+#~ msgid "Not Redistributable"
+#~ msgstr "Não Redistribuível"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Discussão Mínima"
+#~ msgid "Non-Free"
+#~ msgstr "Não-Livre "
-#~ msgid "Quorum"
-#~ msgstr "Quorum"
+#~ msgid "Free"
+#~ msgstr "Livre"
-#~ msgid "Data and Statistics"
-#~ msgstr "Dados e Estatísticas"
+#~ msgid "not redistributable"
+#~ msgstr "não-redistribuível"
-#~ msgid "Majority Requirement"
-#~ msgstr "Maioria Requerida"
+#~ msgid "non-free"
+#~ msgstr "não-livre"
-#~ msgid "Proceedings"
-#~ msgstr "Encaminhamentos"
+#~ msgid "free"
+#~ msgstr "livre"
-#~ msgid "Amendments"
-#~ msgstr "Emendas"
+#~ msgid "License text"
+#~ msgstr "Texto da Licença"
-#~ msgid "Amendment Text B"
-#~ msgstr "Texto da Emenda B"
+#~ msgid "License text (translated)"
+#~ msgstr "Texto da Licença (traduzido)"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Padrinhos da Emenda B"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Este sumário foi preparado por <summary-author/>."
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Proponente da Emenda B"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "O sumário original por <summary-author/> pode ser encontrado nos <a href="
+#~ "\"<summary-url/>\">arquivos da lista</a>."
-#~ msgid "Amendment Text A"
-#~ msgstr "Texto da Emenda A"
+#~ msgid "Original Summary"
+#~ msgstr "Sumário Original"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Padrinhos da Emenda A"
+#~ msgid "Discussion"
+#~ msgstr "Discussão"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Proponente da Emenda A"
+#~ msgid "Justification"
+#~ msgstr "Justificativa"
-#~ msgid "Amendment Text"
-#~ msgstr "Texto da Emenda"
+#~ msgid "Summary"
+#~ msgstr "Sumário"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Padrinhos da Emenda"
+#~ msgid "Version"
+#~ msgstr "Versão"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Proponente da Emenda"
+#~ msgid "License"
+#~ msgstr "Licença"
-#~ msgid "Choices"
-#~ msgstr "Opções"
+#~ msgid "Date published"
+#~ msgstr "Data de publicação"
-#~ msgid "Proposal F"
-#~ msgstr "Proposta F"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Versão %s: %s"
-#~ msgid "Proposal E"
-#~ msgstr "Proposta E"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Proposal D"
-#~ msgstr "Proposta D"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Arquivo Debian-Legal"
-#~ msgid "Proposal C"
-#~ msgstr "Proposta C"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "Proposal B"
-#~ msgstr "Proposta B"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Proposal A"
-#~ msgstr "Proposta A"
+#~ msgid "DLS Index"
+#~ msgstr "Índice DLS"
-#~ msgid "Text"
-#~ msgstr "Texto"
+#~ msgid "License Information"
+#~ msgstr "Informações de Licença"
-#~ msgid "Opposition"
-#~ msgstr "Oposição"
+#~ msgid "package info"
+#~ msgstr "informações do pacote"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Padrinhos da Proposta F"
+#~ msgid "requested %s days ago."
+#~ msgstr "requisitado a %s dias."
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Padrinhos da Proposta E"
+#~ msgid "requested yesterday."
+#~ msgstr "requisitado ontem."
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Padrinhos da Proposta D"
+#~ msgid "requested today."
+#~ msgstr "requisitado hoje."
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Padrinhos da Proposta C"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s dias em preparação."
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Padrinhos da Proposta B"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "em preparação desde ontem."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Padrinhos da Proposta A"
+#~ msgid "in preparation since today."
+#~ msgstr "em preparação desde hoje."
-#~ msgid "Seconds"
-#~ msgstr "Padrinhos"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s dias em adoção."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Proponente da Proposta F"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "em adoção desde ontem."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Proponente da Proposta E"
+#~ msgid "in adoption since today."
+#~ msgstr "em adoção desde hoje."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Proponente da Proposta D"
+#~ msgid "No help requested"
+#~ msgstr "Nenhuma ajuda requisitada"
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Proponente da Proposta C"
+#~ msgid "No Requested packages"
+#~ msgstr "Nenhum pacote requisitado"
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Proponente da Proposta B"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Nenhum pacote esperando para ser empacotado"
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Proponente da Proposta A"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Nenhum pacote esperando para ser adotado"
-#~ msgid "Proposer"
-#~ msgstr "Proponente"
+#~ msgid "No orphaned packages"
+#~ msgstr "Nenhum pacote órfão"
-#~ msgid "Platforms"
-#~ msgstr "Plataformas"
+#~ msgid "No requests for adoption"
+#~ msgstr "Nenhuma requisição para adoção"
-#~ msgid "Debate"
-#~ msgstr "Debate"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Esta edição das Notícias Semanais Debian foi "
+#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Nominations"
-#~ msgstr "Candidaturas"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edição das Notícias Semanais Debian foi "
+#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Time Line"
-#~ msgstr "Linha do Tempo"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />As Notícias Semanais Debian são editadas por <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Date"
-#~ msgstr "Data"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />As Notícias Semanais Debian são editadas por <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">Lista de discussão pública</a> em "
-#~ "inglês para CDs/DVDs:"
+#~ "Para receber este boletim semanalmente em sua caixa postal, <a href="
+#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
+#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
+#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
+#~ "\">inscreva-se na lista debian-news</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />misc"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Voltar para a <a href=\"./\">página de palestrantes do Debian</a>."
-#~ msgid "net_install"
-#~ msgstr "net_install"
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de Palestrantes"
-#~ msgid "buy"
-#~ msgstr "compre"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Ela foi traduzida por %s."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Ela foi traduzida por %s."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Ela foi traduzida por %s."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Ela foi traduzida por %s."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_em_cd"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Esta edição das Notícias do Projeto Debian foi "
+#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Equipe Debian CD"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edição das Notícias do Projeto Debian foi "
+#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Informações sobre o Lançamento da Imagem"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />As Notícias do Projeto Debian são editadas por <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Baixar com Torrent"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />As Notícias do Projeto Debian são editadas por <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Espelhos Rsync"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "<a href=\"../../\">Edições anteriores</a> deste boletim estão disponíveis."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Espelhando"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Para receber este boletim quinzenalmente em sua caixa postal, <a href="
+#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
+#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
+#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
+#~ "\">inscreva-se na lista debian-news</a>."
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Arte gráfica"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (link quebrado)"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Misc"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Voltar para: outras <a href=\"./\">notícias Debian</a> || <a href="
+#~ "\"m4_HOME/\">página inicial do Projeto Debian</a>."
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Baixar"
+#~ msgid "Download calendar entry"
+#~ msgstr "Baixar entrada no calendário"
-#~ msgid "Network Install"
-#~ msgstr "Instalação via Rede"
+#~ msgid "Latest News"
+#~ msgstr "Últimas Notícias"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Comprar CDs ou DVDs"
+#~ msgid "Related Links"
+#~ msgstr "Links Relacionados"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Baixar via HTTP/FTP"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordenador do</th><th>Projeto</th>"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Baixar com Jigdo"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordenador Principal"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Debian Involvement"
+#~ msgstr "Envolvimento do Debian"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Voltar para a <a href=\"./\">página de consultores do Debian</a>."
+#~ msgid "More Info"
+#~ msgstr "Mais Informações"
-#~ msgid "List of Consultants"
-#~ msgstr "Lista de Consultores"
+#~ msgid "Where"
+#~ msgstr "Onde"
-#~ msgid "Rating:"
-#~ msgstr "Classificação:"
+#~ msgid "When"
+#~ msgstr "Quando"
-#~ msgid "Nobody"
-#~ msgstr "Ninguém"
+#~ msgid "link may no longer be valid"
+#~ msgstr "o link pode não ser mais válido"
-#~ msgid "Taken by:"
-#~ msgstr "Tirado por:"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Próximas Atrações"
-#~ msgid "More information:"
-#~ msgstr "Mais informações:"
+#~ msgid "More information"
+#~ msgstr "Informações adicionais"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Visite o patrocinador do site"
+#~ msgid "Select a server near you"
+#~ msgstr "Escolha um servidor próximo de você"
+
+#, fuzzy
+#~| msgid "Project News"
+#~ msgid "Project&nbsp;News"
+#~ msgstr "Notícias do Projeto"
+
+#, fuzzy
+#~| msgid "Weekly News"
+#~ msgid "Weekly&nbsp;News"
+#~ msgstr "Notícias Semanais"
diff --git a/portuguese/po/vendors.pt.po b/portuguese/po/vendors.pt.po
index 466e66f3a00..744e982d251 100644
--- a/portuguese/po/vendors.pt.po
+++ b/portuguese/po/vendors.pt.po
@@ -71,80 +71,80 @@ msgstr "fonte"
msgid "and"
msgstr "e"
-#~ msgid "Vendor:"
-#~ msgstr "Vendedor:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL da Página Debian:"
+#~ msgid "updated monthly"
+#~ msgstr "atualizado mensalmente"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Permitem Contribuição para o Debian:"
+#~ msgid "updated twice weekly"
+#~ msgstr "atualizado duas vezes por semana"
-#~ msgid "Country:"
-#~ msgstr "País:"
+#~ msgid "updated weekly"
+#~ msgstr "atualização semanal"
-#~ msgid "Ship International:"
-#~ msgstr "Entrega internacional:"
+#~ msgid "reseller"
+#~ msgstr "revendedor"
-#~ msgid "email:"
-#~ msgstr "e-mail:"
+#~ msgid "reseller of $var"
+#~ msgstr "revendedor de $var"
-#~ msgid "CD Type:"
-#~ msgstr "Tipo de CD:"
+#~ msgid "Custom Release"
+#~ msgstr "Versão customizada"
-#~ msgid "DVD Type:"
-#~ msgstr "Tipo de DVD:"
+#~ msgid "vendor additions"
+#~ msgstr "adições do vendedor"
-#~ msgid "BD Type:"
-#~ msgstr "Tipo de BD:"
+#~ msgid "contrib included"
+#~ msgstr "contrib incluído"
-#~ msgid "USB Type:"
-#~ msgstr "Tipo de USB:"
+#~ msgid "non-free included"
+#~ msgstr "non-free incluído"
-#~ msgid "Architectures:"
-#~ msgstr "Arquiteturas:"
+#~ msgid "non-US included"
+#~ msgstr "non-US incluído"
-#~ msgid "Official CD"
-#~ msgstr "CD Oficial"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Distribuição múltipla"
-#~ msgid "Official DVD"
-#~ msgstr "DVD Oficial"
+#~ msgid "Vendor Release"
+#~ msgstr "Versão do Vendedor"
#~ msgid "Development Snapshot"
#~ msgstr "Versão de desenvolvimento"
-#~ msgid "Vendor Release"
-#~ msgstr "Versão do Vendedor"
+#~ msgid "Official DVD"
+#~ msgstr "DVD Oficial"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Distribuição múltipla"
+#~ msgid "Official CD"
+#~ msgstr "CD Oficial"
-#~ msgid "non-US included"
-#~ msgstr "non-US incluído"
+#~ msgid "Architectures:"
+#~ msgstr "Arquiteturas:"
-#~ msgid "non-free included"
-#~ msgstr "non-free incluído"
+#~ msgid "USB Type:"
+#~ msgstr "Tipo de USB:"
-#~ msgid "contrib included"
-#~ msgstr "contrib incluído"
+#~ msgid "BD Type:"
+#~ msgstr "Tipo de BD:"
-#~ msgid "vendor additions"
-#~ msgstr "adições do vendedor"
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo de DVD:"
-#~ msgid "Custom Release"
-#~ msgstr "Versão customizada"
+#~ msgid "CD Type:"
+#~ msgstr "Tipo de CD:"
-#~ msgid "reseller of $var"
-#~ msgstr "revendedor de $var"
+#~ msgid "email:"
+#~ msgstr "e-mail:"
-#~ msgid "reseller"
-#~ msgstr "revendedor"
+#~ msgid "Ship International:"
+#~ msgstr "Entrega internacional:"
-#~ msgid "updated weekly"
-#~ msgstr "atualização semanal"
+#~ msgid "Country:"
+#~ msgstr "País:"
-#~ msgid "updated twice weekly"
-#~ msgstr "atualizado duas vezes por semana"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permitem Contribuição para o Debian:"
-#~ msgid "updated monthly"
-#~ msgstr "atualizado mensalmente"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL da Página Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
diff --git a/romanian/po/blends.ro.po b/romanian/po/blends.ro.po
index 40cf6823033..1dfd8e8b38f 100644
--- a/romanian/po/blends.ro.po
+++ b/romanian/po/blends.ro.po
@@ -27,13 +27,25 @@ msgstr "Derivative"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Debian Astro are ca scop modelarea sistemului de operare Debian pentru a fi "
+"util astronomilor, profesioniști sau hobbyiști. Acesta oferă un mare număr "
+"de pachete software ce pot fi folosite, printre altele, pentru controlul "
+"telescoapelor, prezentarea de date etc."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"DebiChem este un blend creat pentru a oferi chimiștilor (sau persoanelor "
"pasionate de chimie) o platformă Debian utilă pentru munca de zi cu zi."
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
#, fuzzy
#| msgid ""
#| "The goal of Debian Games is to provide games in Debian from arcade and "
@@ -46,7 +58,7 @@ msgstr ""
"jocuri pentru cei pasionați, de la cele de strategie sau simulatoare până la "
"cele de tip arcade sau de aventură."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -54,7 +66,7 @@ msgstr ""
"Debian Edu oferă un sistem de operare conceput pentru a fi utilizat în școli "
"sau alte instituții educaționale."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -63,7 +75,7 @@ msgstr ""
"distribuție pentru utilizatorii interesați de GIS (Sistem de Informații "
"Geografice)."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -71,7 +83,7 @@ msgstr ""
"Debian Junior are ca scop adaptarea sistemului de operare Debian pentru "
"copii."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -83,7 +95,7 @@ msgstr ""
"oferă software gratuit și open-source pentru bioinformatică, imagistică "
"medicală sau infrastructură medicală IT, printre altele."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -91,7 +103,7 @@ msgstr ""
"Debian Multimedia are ca scop adaptarea sistemului de operare Debian într-o "
"platformă de lucru audio și multimedia."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -110,25 +122,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Debian Astro are ca scop modelarea sistemului de operare Debian pentru a fi "
-"util astronomilor, profesioniști sau hobbyiști. Acesta oferă un mare număr "
-"de pachete software ce pot fi folosite, printre altele, pentru controlul "
-"telescoapelor, prezentarea de date etc."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Debian Design oferă pachete software pentru designeri și include aplicații "
"pentru design grafic, web sau multimedia."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -142,7 +142,7 @@ msgstr ""
"în țările în curs de dezvoltare, cum ar fi țările Africane, Afganistan, "
"Indonezia sau Vietnam."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -155,7 +155,7 @@ msgstr ""
"se numără bloguri, website-uri, rețele sociale, proxy-uri web sau releuri "
"Tor, astfel încât datele rămân confidențiale."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -164,7 +164,7 @@ msgstr ""
"celor pasionați de radio, oferind printre altele programe de logare sau "
"aplicații pentru a comunica cu noduri packet radio."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -172,8 +172,8 @@ msgstr ""
"Scopul blend-ului DebianParl este de a oferi aplicații menite pentru "
"parlamentari, politicieni și angajații acestora din întreaga lume."
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian Accesibilitate"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games"
diff --git a/romanian/po/bugs.ro.po b/romanian/po/bugs.ro.po
index 95c3b9ba700..275562cdf0f 100644
--- a/romanian/po/bugs.ro.po
+++ b/romanian/po/bugs.ro.po
@@ -161,131 +161,131 @@ msgstr "Arhivate"
msgid "Archived and Unarchived"
msgstr "Arhivate și nearhivate"
-#~ msgid "Flag"
-#~ msgstr "Opțiuni:"
-
-#~ msgid "active bugs"
-#~ msgstr "probleme nerezolvate"
+#~ msgid "Exclude tag:"
+#~ msgstr "Exclude tag:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "arată problemele numai o dată"
+#~ msgid "Include tag:"
+#~ msgstr "Include tag:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "fără ordine"
+#~ msgid "wontfix"
+#~ msgstr "nu va fi rezolvat"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "nu arăta indexul în antet"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "nu arăta statistici în josul paginii"
+#~ msgid "unreproducible"
+#~ msgstr "imposibil de reprodus"
-#~ msgid "bugs"
-#~ msgstr "probleme"
+#~ msgid "security"
+#~ msgstr "securitate"
-#~ msgid "open"
-#~ msgstr "deschis"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "forwarded"
-#~ msgstr "redirecționat"
+#~ msgid "moreinfo"
+#~ msgstr "mai multe informatii"
-#~ msgid "pending"
-#~ msgstr "pe cale de a fi rezolvat"
+#~ msgid "help"
+#~ msgstr "ajutor"
-#~ msgid "fixed"
-#~ msgstr "rezolvat"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixat-upstream"
-#~ msgid "done"
-#~ msgstr "terminat"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixat-in-experimental"
-#~ msgid "Include status:"
-#~ msgstr "Inclus:"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Exclude status:"
-#~ msgstr "Exclus"
+#~ msgid "confirmed"
+#~ msgstr "confirmat"
-#~ msgid "critical"
-#~ msgstr "critic"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "grave"
-#~ msgstr "grav"
+#, fuzzy
+#~ msgid "lenny-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "serious"
-#~ msgstr "serios"
+#, fuzzy
+#~ msgid "etch-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "important"
+#, fuzzy
+#~ msgid "etch"
+#~ msgstr "patch"
-#~ msgid "minor"
-#~ msgstr "minor"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "wishlist"
-#~ msgstr "sub examinare"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Include severitatea:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Exclude severitatea:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Include severitatea:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "sub examinare"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "minor"
-#, fuzzy
-#~ msgid "etch"
-#~ msgstr "patch"
+#~ msgid "important"
+#~ msgstr "important"
-#, fuzzy
-#~ msgid "etch-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "serios"
-#, fuzzy
-#~ msgid "lenny-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "grave"
+#~ msgstr "grav"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "critical"
+#~ msgstr "critic"
-#~ msgid "confirmed"
-#~ msgstr "confirmat"
+#~ msgid "Exclude status:"
+#~ msgstr "Exclus"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "Include status:"
+#~ msgstr "Inclus:"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixat-in-experimental"
+#~ msgid "done"
+#~ msgstr "terminat"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixat-upstream"
+#~ msgid "fixed"
+#~ msgstr "rezolvat"
-#~ msgid "help"
-#~ msgstr "ajutor"
+#~ msgid "pending"
+#~ msgstr "pe cale de a fi rezolvat"
-#~ msgid "moreinfo"
-#~ msgstr "mai multe informatii"
+#~ msgid "forwarded"
+#~ msgstr "redirecționat"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "open"
+#~ msgstr "deschis"
-#~ msgid "security"
-#~ msgstr "securitate"
+#~ msgid "bugs"
+#~ msgstr "probleme"
-#~ msgid "unreproducible"
-#~ msgstr "imposibil de reprodus"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "nu arăta statistici în josul paginii"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "nu arăta indexul în antet"
-#~ msgid "wontfix"
-#~ msgstr "nu va fi rezolvat"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "fără ordine"
-#~ msgid "Include tag:"
-#~ msgstr "Include tag:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "arată problemele numai o dată"
-#~ msgid "Exclude tag:"
-#~ msgstr "Exclude tag:"
+#~ msgid "active bugs"
+#~ msgstr "probleme nerezolvate"
+
+#~ msgid "Flag"
+#~ msgstr "Opțiuni:"
diff --git a/romanian/po/distrib.ro.po b/romanian/po/distrib.ro.po
index 411b5ef6d46..5725ede84e8 100644
--- a/romanian/po/distrib.ro.po
+++ b/romanian/po/distrib.ro.po
@@ -202,12 +202,12 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#, fuzzy
-#~ msgid "Case sensitive"
+#~ msgid "Search case sensitive"
#~ msgstr "Caut&#259; majuscule/minuscule"
#~ msgid "Allow searching on subwords"
#~ msgstr "Permite c&#259;utare cu"
-#~ msgid "Search case sensitive"
+#, fuzzy
+#~ msgid "Case sensitive"
#~ msgstr "Caut&#259; majuscule/minuscule"
diff --git a/romanian/po/doc.ro.po b/romanian/po/doc.ro.po
index c12506c3761..f4077947a09 100644
--- a/romanian/po/doc.ro.po
+++ b/romanian/po/doc.ro.po
@@ -66,8 +66,8 @@ 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:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
#, fuzzy
#| msgid ""
#| "Written by two Debian developers, this free book\n"
@@ -126,49 +126,7 @@ msgstr ""
"(fie \n"
" de acasă, de la birou, club sau școală)."
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Arhitectura Debian 2.2 ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-"Această carte este pentru dezvoltatori ce lucrează cu GNU/Linux pe "
-"procesoare.\n"
-" ARM. Cartea tratează configurarea pentru unele dispozitive, în special "
-"LART,\n"
-" Assabet, Psion5.\n"
-" Aceasta mai conține informații generice, unelte și tehnici. Ansamblul de\n"
-" unelte GNU este tratat în formă nativă sau pentru cross-compilare, la fel "
-"și\n"
-"bootloaderele, \n"
-" peticele de kernel, discurile RAM, particularitățile ARM și alte\n"
-" resurse ARM. Mai\n"
-" include informații extinse sub formă de tutorial pentru bazele GNU/Linux\n"
-" pentru dezvoltatori\n"
-" care vin de pe alte platforme.\n"
-" Nu este specific pentru Debian, dar distribuția Aleph\n"
-" ARMLinux este foarte apropiată de Debian-ARM și presupunem că \n"
-" veți lucra pornind de la această distribuție și preferabil veți avea o\n"
-" distribuție bazată pe Debian și pe mașina gazdă."
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -190,7 +148,7 @@ msgstr ""
"și\n"
" administratorul care vrea să-și construiască o rețea solidă cu Debian."
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
#, fuzzy
#| msgid ""
#| "The book covers topics ranging from concepts of package \n"
@@ -218,7 +176,7 @@ 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:162
+#: ../../english/doc/books.data:140
#, fuzzy
#| msgid ""
#| "This book teaches you how to install and configure the system and also "
@@ -238,6 +196,22 @@ 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
+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:"
@@ -290,13 +264,13 @@ msgstr "(versiunea <get-var version />)"
msgid "plain text"
msgstr "text simplu"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"Ultima <get-var srctype /> sursă este disponibilă în<a href=\"https://www."
-"debian.org/doc/cvs\">Subversion</a>."
+"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
@@ -324,14 +298,6 @@ msgstr ""
"Ultima <get-var srctype /> sursă este disponibilă în <a href=\"https://"
"packages.debian.org/subversion\">Subversion</a>."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Ultima <get-var srctype /> sursă este disponibilă în <a href=\"https://"
-"packages.debian.org/git\">Git</a>."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -363,201 +329,120 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Language:"
-#~ msgstr "Limbaj:"
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Folosiți <a href=\"cvs\">SVN</a> pentru a obține sursele SGML pentru <get-"
-#~ "var ddp_pkg_loc />."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD Sarge cu program de instalare și o selecție de pachete"
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "O <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
-#~ "titnr=254925022\">\n"
-#~ " publicație</a> alternativă este disponibilă de la Lehmanns "
-#~ "Fachbuchhandlung și costă 29.95\n"
-#~ " euro (preț actualizat în 2008)."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "CD live cu Knoppix"
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Aceasta este cartea potrivită pentru a învăța cum să creați platforme "
-#~ "simple sau complexe folosind doar software liber. În interior veți găsi o "
-#~ "gamă largă de proceduri revizuite conform bunelor practici pentru "
-#~ "implementarea infrastructurii IT. Acest ghid ușor de citit și cuprinzător "
-#~ "vă va ajuta să vă atingeți scopul prin folosirea sistemului de operare "
-#~ "Debian GNU/Linux."
+#~ "Începătorii și utilizatorii avansați vor găsi în această carte o \n"
+#~ " sursă cuprinzătoare de informații pentru a utiliza Debian pentru "
+#~ "desktopuri,\n"
+#~ " servere intranet și internet și dezvoltare. Mai conține și \n"
+#~ " informații despre proiect și tratează în mod detaliat\n"
+#~ " sistemul de gestionare al pachetelor specific Debian."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Această carte este împărțită în patru părți: concepte de bază, "
-#~ "gestionarea\n"
-#~ " GNU/Linux, administrarea sistemului și operațiuni avansate. Fiecare "
-#~ "capitol\n"
-#~ " explică în detaliu funcțiile sistemului de operare. Primele\n"
-#~ " capitole explică structura GNU/Linux. Aceste capitole ajută cititorul "
-#~ "să\n"
-#~ " înțeleagă utilizarea resurselor de bază, cum ar fi\n"
-#~ " procesorul sau memoria. O analiză detaliată a sistemelor de fișiere, \n"
-#~ " cum ar fi Ext2, Ext3 și ReiserFS vor permite utilizatorilor să facă "
-#~ "alegerea\n"
-#~ " corectă pentru nevoile lor. Vei învăța cum sa înțelegi \n"
-#~ " performanța sistemului. Cartea este adresată studenților și oricui "
-#~ "dorește\n"
-#~ " să învețe GNU/Linux în detaliu. Cartea tratează Debian Sarge."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "Debian GNU/Linux 3.1r0a „sarge” official pe DVD (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Prima carte în limba persană despre Debian GNU/Linux. Cartea vă ajută să\n"
-#~ " instalați Debian GNU/Linux și să setați servicii în rețea, precum "
-#~ "servere web,\n"
-#~ " baze de date, firewall, mail, ftp și altele. De asemenea, vă ajută să "
-#~ "începeți\n"
-#~ " să utilizați GNU/Linux și puternicul sistem de pachete Debian."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Această carte introduce concepte și tehnici ale sistemului de operare "
+#~ "Debian\n"
+#~ " care explică utilizarea acestora și capcanele asociate și \n"
+#~ " care ilustrează gândirea din spatele fiecărei abordări. Scopul nu este "
+#~ "de\n"
+#~ " a fi un ghid de referință, dar de a oferi cititorului suficiente "
+#~ "cunoștințe \n"
+#~ " despre mecanismele proiectului și a sistemului de operare pentru a "
+#~ "învăța și\n"
+#~ " îmbrățișa soluțiile sofisticate și elegante, uneori aparent "
+#~ "neintuitive\n"
+#~ " care au evoluat ca parte din sistemele Debian\n"
+#~ " în ultimul deceniu. Deși se adresează unui administrator UNIX/Linux\n"
+#~ " versat, cartea poate fi și o resursă excelentă alături de o referință \n"
+#~ " standard Linux pentru a acumula o experiență inițială\n"
+#~ " Linux în cadrul filosofiei „de jos în sus” a Debian."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Această carte introduce cititorii în Debian GNU/Linux cu multe\n"
-#~ " tutoriale practice și sfaturi. Scrisă în coreeană, această carte "
-#~ "acoperă\n"
-#~ " aspecte cuprinzătoare ale sistemului Debian GNU/Linux: prima "
-#~ "configurare,\n"
-#~ " instalarea pachetelor, configurarea X, conectarea la internet, "
-#~ "întreținerea\n"
-#~ " rețelei și multe altele. Această carte oferă o mulțime de sfaturi "
-#~ "despre\n"
-#~ " setarea mediului Debian în limba coreeană și este utilă și pentru "
-#~ "începători."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Trei CD-uri oficiale potato r3 și un CD neoficial woody"
+#~ "Un ghid practic de referință pentru sistemul Debian GNU/Linux care "
+#~ "arată,\n"
+#~ " în mai bine de 1500 de <q>rețete</q>, cum se poate utiliza pentru \n"
+#~ " activități de zi cu zi, de la lucrul cu text, imagini și sunete la\n"
+#~ " productivitate și rețelistică. La fel ca și programele descrise în "
+#~ "carte, \n"
+#~ " cartea este copyleft iar sursele sunt disponibile."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Această carte oferă un ghid scurt pentru instalarea Debian \n"
-#~ " GNU/Linux, fundamentele comenzilor Unix sau Linux, configurarea de bază "
-#~ "și\n"
-#~ " mentenanța sistemului și rețelistică,\n"
-#~ " configurarea X Window System și utilizarea fișierelor multimedia în "
-#~ "Debian GNU/Linux.\n"
-#~ " Această carte mai include un ghid pentru întreținători, care "
-#~ "stimulează\n"
-#~ " oamenii din Coreea să devină întreținători oficiali Debian."
+#~ "„Să învățăm Debian GNU/Linux” ghidează noul utilizator de Linux prin\n"
+#~ " instalarea și configurarea Debian GNU/Linux.\n"
+#~ " Utilizatorii de Windows vor avea parte de o introducere blândă în "
+#~ "această\n"
+#~ " incitantă lume a tehnicii de calcul cu ajutorul cărții scrise de Bill "
+#~ "McCarty."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 Woody neoficial, 3 Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Această carte acoperă subiecte generale Debian GNU/Linux:\n"
-#~ " instalarea, APT și dpkg, shell, X Window System, rețelistică, "
-#~ "administrarea\n"
-#~ " sistemului, configurarea kernelului, partajarea cu Windows, "
-#~ "construirea\n"
-#~ " serverelor și altele.\n"
-#~ " Veți putea instala și începe să folosiți mediul japonez Debian GNU/"
-#~ "Linux\n"
-#~ " foarte ușor cu aceste CD-uri particularizate."
+#~ "Include mai mult de 230 de pagini și trei discuri CD-ROM. Subiectele "
+#~ "acoperite\n"
+#~ " includ Debian Linux, rețelistică, unelte de programare, GUI, desktop\n"
+#~ " publicare, afaceri, lucruri distractive și multimedia. Mai sunt incluse "
+#~ "30\n"
+#~ " de zile de suport e-mail gratuit."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 ediția autorului (3 CD-uri)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Este cea mai recentă carte pentru Sarge a seriei suportată ca o biblie "
-#~ "standard\n"
-#~ " pentru Debian în Japonia.\n"
-#~ " Cartea acoperă toate aspectele utilizării Debian GNU/Linux 3.1 Sarge, "
-#~ "cum ar\n"
-#~ " fi instalarea, medii desktop, administrarea sistemului și \n"
-#~ " configurarea serverului. De asemenea, cartea mai include un pachet de "
-#~ "fonturi\n"
-#~ " comerciale care vă decorează desktopul. Această carte poate fi utilă "
-#~ "pentru\n"
-#~ " toți utilizatorii Debian, de la începători, la avansați."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 ediții: Una fără DVD, cealaltă cu 2 DVD-uri (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr ""
-#~ "Debian GNU/Linux 3.1r0 i386, ediția autorului (DVD +\n"
-#~ " CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) pe DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Această carte este sub formă de dicționar și conține sfaturi diverse "
-#~ "pentru\n"
-#~ " utilizatorii începători și de nivel mediu; instalarea prin varii "
-#~ "metode,\n"
-#~ " particularizarea desktopului, depanarea defectelor, cunoștințe "
-#~ "valoroase și altele."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Program de instalare Debian GNU/Linux 3.1 Sarge (CD single-width)"
+#~ "2 ediții: Una fără CD, cealaltă cu CD-ul oficial (i386, contrib și surse)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -594,117 +479,248 @@ msgstr "PDF"
#~ "sau\n"
#~ " a unui server pentru clienți Windows (Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Program de instalare Debian GNU/Linux 3.1 Sarge (CD single-width)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "2 ediții: Una fără CD, cealaltă cu CD-ul oficial (i386, contrib și surse)"
+#~ "Această carte este sub formă de dicționar și conține sfaturi diverse "
+#~ "pentru\n"
+#~ " utilizatorii începători și de nivel mediu; instalarea prin varii "
+#~ "metode,\n"
+#~ " particularizarea desktopului, depanarea defectelor, cunoștințe "
+#~ "valoroase și altele."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) pe DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr ""
+#~ "Debian GNU/Linux 3.1r0 i386, ediția autorului (DVD +\n"
+#~ " CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 ediții: Una fără DVD, cealaltă cu 2 DVD-uri (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Este cea mai recentă carte pentru Sarge a seriei suportată ca o biblie "
+#~ "standard\n"
+#~ " pentru Debian în Japonia.\n"
+#~ " Cartea acoperă toate aspectele utilizării Debian GNU/Linux 3.1 Sarge, "
+#~ "cum ar\n"
+#~ " fi instalarea, medii desktop, administrarea sistemului și \n"
+#~ " configurarea serverului. De asemenea, cartea mai include un pachet de "
+#~ "fonturi\n"
+#~ " comerciale care vă decorează desktopul. Această carte poate fi utilă "
+#~ "pentru\n"
+#~ " toți utilizatorii Debian, de la începători, la avansați."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 ediția autorului (3 CD-uri)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Include mai mult de 230 de pagini și trei discuri CD-ROM. Subiectele "
-#~ "acoperite\n"
-#~ " includ Debian Linux, rețelistică, unelte de programare, GUI, desktop\n"
-#~ " publicare, afaceri, lucruri distractive și multimedia. Mai sunt incluse "
-#~ "30\n"
-#~ " de zile de suport e-mail gratuit."
+#~ "Această carte acoperă subiecte generale Debian GNU/Linux:\n"
+#~ " instalarea, APT și dpkg, shell, X Window System, rețelistică, "
+#~ "administrarea\n"
+#~ " sistemului, configurarea kernelului, partajarea cu Windows, "
+#~ "construirea\n"
+#~ " serverelor și altele.\n"
+#~ " Veți putea instala și începe să folosiți mediul japonez Debian GNU/"
+#~ "Linux\n"
+#~ " foarte ușor cu aceste CD-uri particularizate."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 Woody neoficial, 3 Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "„Să învățăm Debian GNU/Linux” ghidează noul utilizator de Linux prin\n"
-#~ " instalarea și configurarea Debian GNU/Linux.\n"
-#~ " Utilizatorii de Windows vor avea parte de o introducere blândă în "
-#~ "această\n"
-#~ " incitantă lume a tehnicii de calcul cu ajutorul cărții scrise de Bill "
-#~ "McCarty."
+#~ "Această carte oferă un ghid scurt pentru instalarea Debian \n"
+#~ " GNU/Linux, fundamentele comenzilor Unix sau Linux, configurarea de bază "
+#~ "și\n"
+#~ " mentenanța sistemului și rețelistică,\n"
+#~ " configurarea X Window System și utilizarea fișierelor multimedia în "
+#~ "Debian GNU/Linux.\n"
+#~ " Această carte mai include un ghid pentru întreținători, care "
+#~ "stimulează\n"
+#~ " oamenii din Coreea să devină întreținători oficiali Debian."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Trei CD-uri oficiale potato r3 și un CD neoficial woody"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Un ghid practic de referință pentru sistemul Debian GNU/Linux care "
-#~ "arată,\n"
-#~ " în mai bine de 1500 de <q>rețete</q>, cum se poate utiliza pentru \n"
-#~ " activități de zi cu zi, de la lucrul cu text, imagini și sunete la\n"
-#~ " productivitate și rețelistică. La fel ca și programele descrise în "
-#~ "carte, \n"
-#~ " cartea este copyleft iar sursele sunt disponibile."
+#~ "Această carte introduce cititorii în Debian GNU/Linux cu multe\n"
+#~ " tutoriale practice și sfaturi. Scrisă în coreeană, această carte "
+#~ "acoperă\n"
+#~ " aspecte cuprinzătoare ale sistemului Debian GNU/Linux: prima "
+#~ "configurare,\n"
+#~ " instalarea pachetelor, configurarea X, conectarea la internet, "
+#~ "întreținerea\n"
+#~ " rețelei și multe altele. Această carte oferă o mulțime de sfaturi "
+#~ "despre\n"
+#~ " setarea mediului Debian în limba coreeană și este utilă și pentru "
+#~ "începători."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Această carte introduce concepte și tehnici ale sistemului de operare "
-#~ "Debian\n"
-#~ " care explică utilizarea acestora și capcanele asociate și \n"
-#~ " care ilustrează gândirea din spatele fiecărei abordări. Scopul nu este "
-#~ "de\n"
-#~ " a fi un ghid de referință, dar de a oferi cititorului suficiente "
-#~ "cunoștințe \n"
-#~ " despre mecanismele proiectului și a sistemului de operare pentru a "
-#~ "învăța și\n"
-#~ " îmbrățișa soluțiile sofisticate și elegante, uneori aparent "
-#~ "neintuitive\n"
-#~ " care au evoluat ca parte din sistemele Debian\n"
-#~ " în ultimul deceniu. Deși se adresează unui administrator UNIX/Linux\n"
-#~ " versat, cartea poate fi și o resursă excelentă alături de o referință \n"
-#~ " standard Linux pentru a acumula o experiență inițială\n"
-#~ " Linux în cadrul filosofiei „de jos în sus” a Debian."
+#~ "Prima carte în limba persană despre Debian GNU/Linux. Cartea vă ajută să\n"
+#~ " instalați Debian GNU/Linux și să setați servicii în rețea, precum "
+#~ "servere web,\n"
+#~ " baze de date, firewall, mail, ftp și altele. De asemenea, vă ajută să "
+#~ "începeți\n"
+#~ " să utilizați GNU/Linux și puternicul sistem de pachete Debian."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Debian GNU/Linux 3.1r0a „sarge” official pe DVD (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Această carte este împărțită în patru părți: concepte de bază, "
+#~ "gestionarea\n"
+#~ " GNU/Linux, administrarea sistemului și operațiuni avansate. Fiecare "
+#~ "capitol\n"
+#~ " explică în detaliu funcțiile sistemului de operare. Primele\n"
+#~ " capitole explică structura GNU/Linux. Aceste capitole ajută cititorul "
+#~ "să\n"
+#~ " înțeleagă utilizarea resurselor de bază, cum ar fi\n"
+#~ " procesorul sau memoria. O analiză detaliată a sistemelor de fișiere, \n"
+#~ " cum ar fi Ext2, Ext3 și ReiserFS vor permite utilizatorilor să facă "
+#~ "alegerea\n"
+#~ " corectă pentru nevoile lor. Vei învăța cum sa înțelegi \n"
+#~ " performanța sistemului. Cartea este adresată studenților și oricui "
+#~ "dorește\n"
+#~ " să învețe GNU/Linux în detaliu. Cartea tratează Debian Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Începătorii și utilizatorii avansați vor găsi în această carte o \n"
-#~ " sursă cuprinzătoare de informații pentru a utiliza Debian pentru "
-#~ "desktopuri,\n"
-#~ " servere intranet și internet și dezvoltare. Mai conține și \n"
-#~ " informații despre proiect și tratează în mod detaliat\n"
-#~ " sistemul de gestionare al pachetelor specific Debian."
+#~ "Aceasta este cartea potrivită pentru a învăța cum să creați platforme "
+#~ "simple sau complexe folosind doar software liber. În interior veți găsi o "
+#~ "gamă largă de proceduri revizuite conform bunelor practici pentru "
+#~ "implementarea infrastructurii IT. Acest ghid ușor de citit și cuprinzător "
+#~ "vă va ajuta să vă atingeți scopul prin folosirea sistemului de operare "
+#~ "Debian GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "CD live cu Knoppix"
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "O <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
+#~ "titnr=254925022\">\n"
+#~ " publicație</a> alternativă este disponibilă de la Lehmanns "
+#~ "Fachbuchhandlung și costă 29.95\n"
+#~ " euro (preț actualizat în 2008)."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD Sarge cu program de instalare și o selecție de pachete"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Folosiți <a href=\"cvs\">SVN</a> pentru a obține sursele SGML pentru <get-"
+#~ "var ddp_pkg_loc />."
+
+#~ msgid "Language:"
+#~ msgstr "Limbaj:"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Ultima <get-var srctype /> sursă este disponibilă în<a href=\"https://www."
+#~ "debian.org/doc/cvs\">Subversion</a>."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Această carte este pentru dezvoltatori ce lucrează cu GNU/Linux pe "
+#~ "procesoare.\n"
+#~ " ARM. Cartea tratează configurarea pentru unele dispozitive, în special "
+#~ "LART,\n"
+#~ " Assabet, Psion5.\n"
+#~ " Aceasta mai conține informații generice, unelte și tehnici. Ansamblul "
+#~ "de\n"
+#~ " unelte GNU este tratat în formă nativă sau pentru cross-compilare, la "
+#~ "fel și\n"
+#~ "bootloaderele, \n"
+#~ " peticele de kernel, discurile RAM, particularitățile ARM și alte\n"
+#~ " resurse ARM. Mai\n"
+#~ " include informații extinse sub formă de tutorial pentru bazele GNU/"
+#~ "Linux\n"
+#~ " pentru dezvoltatori\n"
+#~ " care vin de pe alte platforme.\n"
+#~ " Nu este specific pentru Debian, dar distribuția Aleph\n"
+#~ " ARMLinux este foarte apropiată de Debian-ARM și presupunem că \n"
+#~ " veți lucra pornind de la această distribuție și preferabil veți avea o\n"
+#~ " distribuție bazată pe Debian și pe mașina gazdă."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Arhitectura Debian 2.2 ARM"
diff --git a/romanian/po/l10n.ro.po b/romanian/po/l10n.ro.po
index 3c676b89120..e94ce45ada7 100644
--- a/romanian/po/l10n.ro.po
+++ b/romanian/po/l10n.ro.po
@@ -99,8 +99,8 @@ msgstr "Fi&#351;iere pot"
msgid "Hints for translators"
msgstr "Idei ajut&#259;toare pentru traduc&#259;tori"
-#~ msgid "Translated templates"
-#~ msgstr "Modele traduse"
-
#~ msgid "Original templates"
#~ msgstr "Modele originale"
+
+#~ msgid "Translated templates"
+#~ msgstr "Modele traduse"
diff --git a/romanian/po/mailinglists.ro.po b/romanian/po/mailinglists.ro.po
index 7a784279291..0fada43a540 100644
--- a/romanian/po/mailinglists.ro.po
+++ b/romanian/po/mailinglists.ro.po
@@ -130,12 +130,12 @@ msgstr "deschis&#259;"
msgid "closed"
msgstr "&#238;nchis&#259;"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
-#~ "s&#259; v&#259; dezabona&#355;i:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr ""
#~ "V&#259; rug&#259;m s&#259; selecta&#355;i ls ce liste dori&#355;i s&#259; "
#~ "v&#259; abona&#355;i: "
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr ""
+#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
+#~ "s&#259; v&#259; dezabona&#355;i:"
diff --git a/romanian/po/organization.ro.po b/romanian/po/organization.ro.po
index 919ffa0b582..42cfc2a702f 100644
--- a/romanian/po/organization.ro.po
+++ b/romanian/po/organization.ro.po
@@ -73,22 +73,22 @@ msgid "Officers"
msgstr "Ofiteri"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribuție"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Echipa de publicitate"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Suport și Infrastructură"
@@ -105,211 +105,211 @@ msgstr "Conducător"
msgid "Technical Committee"
msgstr "Comitet Tehnic"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Secretar"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Proiecte de dezvoltare"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Arhive FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Asistenți FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Asistenți de configurare FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backport-uri"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Echipa pentru backport-uri"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Pachete individuale"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Administrarea lansărilor"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Echipa de lansare"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Controlul calit&#259;&#355;ii"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Echipa de Instalare Sisteme"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Note de lansare"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Imagini CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Producere"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testare"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infrastructură auto-construibilă"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Echipa Wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Administrarea de build-uri"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "documentație"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr " Potențiale pachete noi sau pachete ce necesită lucru"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Echipa pentru sisteme live"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Porturi"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Configurații speciale"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Laptop-uri"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Firewall-uri"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Sisteme integrate"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Contact de presă"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Pagini Web"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Mobilizare"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Proiectul Debian pentru Femei"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Anti-hărțuire"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Evenimente"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Comitet Tehnic"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Program de parteneriat"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Coordonarea donațiilor hardware"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Suport pentru utilizatori"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Sistem de urmărire pentru bug-uri"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administrare Liste de discuții și Liste de arhive"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Recepție pentru membri noi"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Administratori de conturi Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Menținătorii Keyring-ului (PGP și GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Echipa de Securitate"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Pentru Consultanți"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Pentru Comercianți de CD-uri"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Regulament"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Administrarea Sistemului"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -318,7 +318,7 @@ msgstr ""
"(incluzând schimbarea parolei sau dacă ai nevoie de software), aceasta este "
"adresa pe care o poți folosi. "
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -328,110 +328,128 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator LDAP"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Oglinzi"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Administrator DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Sistem de urmărire a pachetelor"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Cereri pentru folosirea <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">Mărcii înregistrate</a> "
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Administratori Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administratori Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
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:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian pentru practică medicală și cercetare"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian pentru educație"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian pentru birouri de avocatură"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian pentru persoane cu dizabilități"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian pentru știință și cercetare"
-#~ msgid "Publicity"
-#~ msgstr "Publicitate"
-
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Menținătorii Keyring-ului menținătorilor Debian"
-
-#~ msgid "DebConf chairs"
-#~ msgstr "Delegați DebConf"
-
+#: ../../english/intro/organization.data:492
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "echipa de securitate"
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian pentru educație"
#, fuzzy
-#~ msgid "Release Assistants"
-#~ msgstr "note de lansare"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "distribu&#355;ie"
#, fuzzy
-#~ msgid "Release Assistants for ``stable''"
+#~ msgid "Release Team for ``stable''"
#~ msgstr "administratorul lans&#259;rii pentru &#8222;stable&#8221;"
-#, fuzzy
-#~ msgid "Release Wizard"
-#~ msgstr "administratorul lans&#259;rii"
+#~ msgid "Vendors"
+#~ msgstr "v&#226;nz&#259;tori"
-#~ msgid "APT Team"
-#~ msgstr "Echipa APT"
+#, fuzzy
+#~ msgid "Marketing Team"
+#~ msgstr "echipa de securitate"
-#~ msgid "Internal Projects"
-#~ msgstr "proiecte interne"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "echipa systemului de instalare pentru &#8222;stable&#8221;"
#~ msgid "Mailing List Archives"
#~ msgstr "arhivele listelor de e-mail"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "echipa systemului de instalare pentru &#8222;stable&#8221;"
+#~ msgid "Internal Projects"
+#~ msgstr "proiecte interne"
-#, fuzzy
-#~ msgid "Marketing Team"
-#~ msgstr "echipa de securitate"
+#~ msgid "APT Team"
+#~ msgstr "Echipa APT"
-#~ msgid "Vendors"
-#~ msgstr "v&#226;nz&#259;tori"
+#, fuzzy
+#~ msgid "Release Wizard"
+#~ msgstr "administratorul lans&#259;rii"
#, fuzzy
-#~ msgid "Release Team for ``stable''"
+#~ msgid "Release Assistants for ``stable''"
#~ msgstr "administratorul lans&#259;rii pentru &#8222;stable&#8221;"
#, fuzzy
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "distribu&#355;ie"
+#~ msgid "Release Assistants"
+#~ msgstr "note de lansare"
+
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "echipa de securitate"
+
+#~ msgid "DebConf chairs"
+#~ msgstr "Delegați DebConf"
+
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Menținătorii Keyring-ului menținătorilor Debian"
+
+#~ msgid "Publicity"
+#~ msgstr "Publicitate"
+
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
+
+#~ 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..317d5592843 100644
--- a/romanian/po/others.ro.po
+++ b/romanian/po/others.ro.po
@@ -327,86 +327,86 @@ msgstr "Versiune"
msgid "URL"
msgstr "URL"
-#, fuzzy
-#~ msgid "Wanted:"
-#~ msgstr "taxe:"
-
-#, fuzzy
-#~ msgid "Who:"
-#~ msgstr "telefon:"
+#~ msgid "Name:"
+#~ msgstr "nume:"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Company:"
+#~ msgstr "compania:"
-#~ msgid "Previous Talks:"
-#~ msgstr "prezentarea anterioar&#259;"
+#~ msgid "URL:"
+#~ msgstr "pagina pe internet:"
-#~ msgid "Languages:"
-#~ msgstr "limbaje"
+#~ msgid "or"
+#~ msgstr "sau"
-#~ msgid "Location:"
-#~ msgstr "loca&#355;ie:"
+#~ msgid "Email:"
+#~ msgstr "e-mail:"
-#, fuzzy
-#~ msgid "Topics:"
-#~ msgstr "subiect:"
+#~ msgid "Rates:"
+#~ msgstr "taxe:"
-#~ msgid "Q"
-#~ msgstr "&#238;ntreb&#259;ri"
+#~ msgid "Willing to Relocate"
+#~ msgstr "dispus s&#259; se mute"
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Debian GNU/Linux: dictribu&#355;ia dumneavoastr&#259; urm&#259;toare"
-
-#~ msgid "Debian: The Perfect OS"
-#~ msgstr "Debian: sistemul de operare perfect"
-
-#~ msgid "Debian: The biggest is still the best."
-#~ msgstr "Debian: cel mai mare este &#238;nc&#259; cel mai bun."
-
-#~ msgid "Older Debian banners"
-#~ msgstr "baner Debian mai vechi"
-
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: potato a aterizat, anun&#355;&#226;nd versiunea 2.2"
+#~ "<total_consultant> consultan&#355;i Debian lista&#355;i &#238;n "
+#~ "<total_country> &#355;&#259;ri din &#238;ntreaga lume."
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get acum."
+#~ msgid "Mailing List Subscription"
+#~ msgstr "subscrierea la liste de dicu&#355;ii"
-#~ msgid "Newer Debian banners"
-#~ msgstr "baner Debian mai nou"
+#~ msgid ""
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ msgstr ""
+#~ "Vede&#355;i pagina <a href=\"./#subunsub\">listelor de discu&#355;ii</a> "
+#~ "pentru informa&#355;ii despre cum s&#259; v&#259; abona&#355;i folosind e-"
+#~ "mailul. O pagin&#259; <a href=\"unsubscribe\">web de dezabonare </a> este "
+#~ "de asemenea disponibil&#259;, pentru dezabonarea de la listele de "
+#~ "discu&#355;ii."
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "baner&nbsp;animat&nbsp;GIF"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr ""
+#~ "V&#259; rug&#259;m s&#259; selecta&#355;i ls ce liste dori&#355;i s&#259; "
+#~ "v&#259; abona&#355;i: "
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "baner&nbsp;orizontal"
+#~ msgid "No description given"
+#~ msgstr "F&#259;r&#259; descriere"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "baner&nbsp;vertical"
+#~ msgid "Moderated:"
+#~ msgstr "moderat&#259;:"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "numai pentru comitetul tehnic Debian"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Numai abona&#355;ii pot posta mesaje."
-#~ msgid "deity developers only"
-#~ msgstr "numai pentru dezvoltatorii &#8222;deity&#8221;"
+#~ msgid "Subscription:"
+#~ msgstr "Abonare:"
-#~ msgid "developers only"
-#~ msgstr "numai pentru dezvoltatori"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "este numai pentru citire, versiune digest."
-#~ msgid "closed"
-#~ msgstr "&#238;nchis&#259;"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Adresa dumneavoastr&#259; de e-mail:"
-#~ msgid "open"
-#~ msgstr "deschis&#259;"
+#~ msgid "Subscribe"
+#~ msgstr "Abonare"
-#~ msgid "Unsubscribe"
-#~ msgstr "dezabonare"
+#~ msgid "Clear"
+#~ msgstr "&#350;terge"
-#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
-#~ "s&#259; v&#259; dezabona&#355;i:"
+#~ "V&#259; rug&#259;m s&#259; respecta&#355;i <a href=\"./#ads\"> regulile "
+#~ "de publicitate a listelor de discu&#355;ii Debian</a>."
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "dezabonarea de la listele de discu&#355;ii"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -419,83 +419,83 @@ msgstr "URL"
#~ "a> este de asemenea disponibil&#259;, pentru abonarea la listele de "
#~ "discu&#355;ii."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "dezabonarea de la listele de discu&#355;ii"
-
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; respecta&#355;i <a href=\"./#ads\"> regulile "
-#~ "de publicitate a listelor de discu&#355;ii Debian</a>."
+#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
+#~ "s&#259; v&#259; dezabona&#355;i:"
-#~ msgid "Clear"
-#~ msgstr "&#350;terge"
+#~ msgid "Unsubscribe"
+#~ msgstr "dezabonare"
-#~ msgid "Subscribe"
-#~ msgstr "Abonare"
+#~ msgid "open"
+#~ msgstr "deschis&#259;"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Adresa dumneavoastr&#259; de e-mail:"
+#~ msgid "closed"
+#~ msgstr "&#238;nchis&#259;"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "este numai pentru citire, versiune digest."
+#~ msgid "developers only"
+#~ msgstr "numai pentru dezvoltatori"
-#~ msgid "Subscription:"
-#~ msgstr "Abonare:"
+#~ msgid "deity developers only"
+#~ msgstr "numai pentru dezvoltatorii &#8222;deity&#8221;"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Numai abona&#355;ii pot posta mesaje."
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "numai pentru comitetul tehnic Debian"
-#~ msgid "Moderated:"
-#~ msgstr "moderat&#259;:"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "baner&nbsp;vertical"
-#~ msgid "No description given"
-#~ msgstr "F&#259;r&#259; descriere"
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "baner&nbsp;orizontal"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; selecta&#355;i ls ce liste dori&#355;i s&#259; "
-#~ "v&#259; abona&#355;i: "
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "baner&nbsp;animat&nbsp;GIF"
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
-#~ msgstr ""
-#~ "Vede&#355;i pagina <a href=\"./#subunsub\">listelor de discu&#355;ii</a> "
-#~ "pentru informa&#355;ii despre cum s&#259; v&#259; abona&#355;i folosind e-"
-#~ "mailul. O pagin&#259; <a href=\"unsubscribe\">web de dezabonare </a> este "
-#~ "de asemenea disponibil&#259;, pentru dezabonarea de la listele de "
-#~ "discu&#355;ii."
+#~ msgid "Newer Debian banners"
+#~ msgstr "baner Debian mai nou"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "subscrierea la liste de dicu&#355;ii"
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get acum."
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: potato a aterizat, anun&#355;&#226;nd versiunea 2.2"
+
+#~ msgid "Older Debian banners"
+#~ msgstr "baner Debian mai vechi"
+
+#~ msgid "Debian: The biggest is still the best."
+#~ msgstr "Debian: cel mai mare este &#238;nc&#259; cel mai bun."
+
+#~ msgid "Debian: The Perfect OS"
+#~ msgstr "Debian: sistemul de operare perfect"
+
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
#~ msgstr ""
-#~ "<total_consultant> consultan&#355;i Debian lista&#355;i &#238;n "
-#~ "<total_country> &#355;&#259;ri din &#238;ntreaga lume."
+#~ "Debian GNU/Linux: dictribu&#355;ia dumneavoastr&#259; urm&#259;toare"
-#~ msgid "Willing to Relocate"
-#~ msgstr "dispus s&#259; se mute"
+#~ msgid "Q"
+#~ msgstr "&#238;ntreb&#259;ri"
-#~ msgid "Rates:"
-#~ msgstr "taxe:"
+#, fuzzy
+#~ msgid "Topics:"
+#~ msgstr "subiect:"
-#~ msgid "Email:"
-#~ msgstr "e-mail:"
+#~ msgid "Location:"
+#~ msgstr "loca&#355;ie:"
-#~ msgid "or"
-#~ msgstr "sau"
+#~ msgid "Languages:"
+#~ msgstr "limbaje"
-#~ msgid "URL:"
-#~ msgstr "pagina pe internet:"
+#~ msgid "Previous Talks:"
+#~ msgstr "prezentarea anterioar&#259;"
-#~ msgid "Company:"
-#~ msgstr "compania:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Name:"
-#~ msgstr "nume:"
+#, fuzzy
+#~ msgid "Who:"
+#~ msgstr "telefon:"
+
+#, fuzzy
+#~ msgid "Wanted:"
+#~ msgstr "taxe:"
diff --git a/romanian/po/partners.ro.po b/romanian/po/partners.ro.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/romanian/po/partners.ro.po
+++ b/romanian/po/partners.ro.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/romanian/po/ports.ro.po b/romanian/po/ports.ro.po
index debb782ba7e..d72f0840a09 100644
--- a/romanian/po/ports.ro.po
+++ b/romanian/po/ports.ro.po
@@ -115,47 +115,47 @@ msgstr "Debian pentru PowerPC"
msgid "Debian for Sparc"
msgstr "Debian pentru Sparc"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD basata cu libc5"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian pentru laptop-uri"
-#~ msgid "Vendor/Name"
-#~ msgstr "v&#226;nz&#259;tor/nume"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian pentru AMD64"
-#~ msgid "Date announced"
-#~ msgstr "data anun&#355;at&#259;"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian pentru ARM"
-#~ msgid "Clock"
-#~ msgstr "ceas"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian pentru Beowulf"
-#~ msgid "Specials"
-#~ msgstr "speciale"
+#~ msgid "Main"
+#~ msgstr "Principal"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian pentru Sparc64"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian pentru S/390"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian pentru Motorola 680x0"
#~ msgid "Debian for MIPS"
#~ msgstr "Debian pentru MIPS"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian pentru Motorola 680x0"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian pentru S/390"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian pentru Sparc64"
-#~ msgid "Main"
-#~ msgstr "Principal"
+#~ msgid "Specials"
+#~ msgstr "speciale"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian pentru Beowulf"
+#~ msgid "Clock"
+#~ msgstr "ceas"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian pentru ARM"
+#~ msgid "Date announced"
+#~ msgstr "data anun&#355;at&#259;"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian pentru AMD64"
+#~ msgid "Vendor/Name"
+#~ msgstr "v&#226;nz&#259;tor/nume"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian pentru laptop-uri"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD basata cu libc5"
diff --git a/romanian/po/stats.ro.po b/romanian/po/stats.ro.po
index c2041b9135b..f0dcf5fc430 100644
--- a/romanian/po/stats.ro.po
+++ b/romanian/po/stats.ro.po
@@ -30,79 +30,90 @@ msgstr "Mai sunt %d bytes de tradus."
msgid "There are %d strings to translate."
msgstr "Mai sunt %d șiruri de caractere de tradus."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Această traducere este învechită."
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Versiune greșită a traducerii"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Această traducere este învechită."
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Versiunea originală este mai nouă decât traducerea."
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Versiunea originală nu mai există."
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "număr de clicuri N/A"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "clicuri"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Clic aici ca să afli informații despre modificare"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Diferențe unificate"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Diferențe în culoare"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Diferențe în culoare"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Rezumatul traducerii pentru"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Netradus"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Învechit"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Tradus"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "La zi"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "fișiere"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -110,131 +121,131 @@ msgstr ""
"Notă: aceste liste de pagini sunt ordonate după popularitate. Pune cursorul "
"pe numele paginii ca să vezi numărul de clicuri,"
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Traduceri învechite"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Fișier"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diferențe"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Comentariu"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Modificări"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Traducere"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Menținător"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Stare"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Traducător"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Dată"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Pagini generale netraduse"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Pagini generale netraduse"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Știri netraduse"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Știri netraduse"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Pagini de consultanță/ pentru utilizatori netradus"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Pagini de consultanță/ pentru utilizatori netraduse"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Pagini internaționale netraduse"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Pagini internaționale netraduse"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Pagini traduse (la zi)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Tipare de tradus (fișiere PO)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Evidență a traducerilor PO"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Fuzzy"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Netraduse"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Pagini web traduse"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Evidență a traducerilor după numarul de pagini"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Limbi"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Traduceri"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Pagini web traduse (ordonate după marime)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Evidență a traducerilor după mărimea paginilor"
diff --git a/romanian/po/templates.ro.po b/romanian/po/templates.ro.po
index 372008d7591..7c074960863 100644
--- a/romanian/po/templates.ro.po
+++ b/romanian/po/templates.ro.po
@@ -207,11 +207,11 @@ msgstr "în versiunea 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Pentru a raporta o problemă cu site-ul web, trimiteți un e-mail la <a href="
"\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. "
@@ -511,6 +511,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Notă:</em> originalul acestei traduceri nu mai există."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -519,129 +523,226 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Înapoi la pagina <a href=\"./\">Cine utilizează Debian?</a>."
-#~ msgid "Select a server near you"
-#~ msgstr "Alege&#355;i un server apropiat"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Vizitați sponsorii"
-#~ msgid "More information:"
-#~ msgstr "Mai multe informa&#355;ii:"
+#~ msgid "List of Consultants"
+#~ msgstr "Lista consultan&#355;ilor"
-#~ msgid "Taken by:"
-#~ msgstr "Luat&#259; &#238;n grij&#259; de:"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "&#206;napoi la <a href=\"./\">pagina consultan&#355;ilor</a>."
-#~ msgid "Nobody"
-#~ msgstr "Nimeni"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Rating:"
-#~ msgstr "Cotare:"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "desc&#259;rcare cu jigdo"
-#~ msgid "More information"
-#~ msgstr "Mai multe informa&#355;ii"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "desc&#259;rcare prin http/ftp"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Evenimente viitoare"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "Instalare prin re&#355;ea"
-#~ msgid "link may no longer be valid"
-#~ msgstr "trimiterea poate nu mai este valid&#259;"
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_faq\" />faq"
-#~ msgid "When"
-#~ msgstr "C&#238;nd"
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
-#~ msgid "Where"
-#~ msgstr "Unde"
+#, fuzzy
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_faq\" />faq"
-#~ msgid "More Info"
-#~ msgstr "Informa&#355;ii suplimentare"
+#, fuzzy
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
-#~ msgid "Debian Involvement"
-#~ msgstr "Implicarea Debian"
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordonatorul principal"
+#~ msgid "Debian CD team"
+#~ msgstr "Echipa Debian CD"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordonatorul de</th><th>proiect</th>"
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian pe CD"
-#~ msgid "Related Links"
-#~ msgstr "Link-uri interesante"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "Latest News"
-#~ msgstr "Ultimele &#351;tiri"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "Download calendar entry"
-#~ msgstr "Desc&#259;rca&#355;i calendarul"
+#~ msgid "http_ftp"
+#~ msgstr "http/ftp"
+
+#~ msgid "buy"
+#~ msgstr "cump&#259;ra&#355;i"
+
+#~ msgid "net_install"
+#~ msgstr "instalare de pe internet"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />diverse"
#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "&#206;napoi la <a href=\"m4_HOME/\">pagina principal&#259; Debian</a>."
+#~ msgid "Nominations"
+#~ msgstr "Dona&#355;ii"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (leg&#259;tur&#259; inexistent)"
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "Echipa Debian CD"
#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
+#~ msgid "Proposer"
+#~ msgstr "propuse"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "&#206;n discu&#355;ie"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "A&#351;tept&#226;nd sponsorii"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "&#206;n discu&#355;ie"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Vot deschis"
+
+#~ msgid "Decided"
+#~ msgstr "Decis"
+
+#~ msgid "Withdrawn"
+#~ msgstr "Retras"
+
+#~ msgid "Other"
+#~ msgstr "Altele"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Pagina de vot"
+
+#~ msgid "How&nbsp;To"
+#~ msgstr "Cum&nbsp;s&#259;"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Propune&#355;i"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Amenda&#355;i propunerea"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Urm&#259;ri&#355;i propunerea"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Citi&#355;i rezultatul"
+
+#~ msgid "Vote"
+#~ msgstr "Vota&#355;i"
+
+#~ msgid "Debian on CD"
+#~ msgstr "CD-uri cu Debian"
+
+#~ msgid "discussed"
+#~ msgstr "discutate"
+
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "&#206;napoi la alte <a href=\"./\">&#351;tiri Debian</a>."
+
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
-#~ "debian-news."
+#~ "Vede&#355;i <a href=\"m4_HOME/contact\">pagina de contacte</a> Debian "
+#~ "pentru mai multe informa&#355;ii."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgid "network install"
+#~ msgstr "instalare de pe internet"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "cump&#259;ra&#355;i imagini ISO pre-alc&#259;tuite"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "nimic"
+
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "&#206;n discu&#355;ie"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Mai multe informa&#355;ii"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
+
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "Mai multe informa&#355;ii"
+
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "<a href=\"../../\">Edi&#355;ii mai vechi</a> ale acestor &#351;tiri sunt "
-#~ "disponibile"
+#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <a href=\"mailto:dwn@debian.org\">%s</a>."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
#~ "\"mailto:dwn@debian.org\">%s</a>."
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <a href=\"mailto:dwn@debian.org\">%s</a>."
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
+#~ "debian-news."
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "&#206;napoi la <a href=\"./\">pahina Debian a vorbitorilor</a>."
+
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de vorbitori"
#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr ""
+#~ "<void id=\"pluralfemale\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
+#~ "m&#226;nale Debian a fost tradus de %s"
+
+#, fuzzy
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
#~ msgstr ""
#~ "<void id=\"singular\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
-#~ "m&#226;nale Debian a fost tradus de %s."
+#~ "m&#226;nale Debian a fost tradus de %s"
#, fuzzy
#~ msgid "<void id=\"plural\" />It was translated by %s."
@@ -650,222 +751,125 @@ msgstr "Înapoi la pagina <a href=\"./\">Cine utilizează Debian?</a>."
#~ "nale Debian a fost tradus de %s."
#, fuzzy
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgid "<void id=\"singular\" />It was translated by %s."
#~ msgstr ""
#~ "<void id=\"singular\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
-#~ "m&#226;nale Debian a fost tradus de %s"
+#~ "m&#226;nale Debian a fost tradus de %s."
#, fuzzy
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr ""
-#~ "<void id=\"pluralfemale\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
-#~ "m&#226;nale Debian a fost tradus de %s"
-
-#~ msgid "List of Speakers"
-#~ msgstr "Lista de vorbitori"
-
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "&#206;napoi la <a href=\"./\">pahina Debian a vorbitorilor</a>."
-
#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
-#~ "debian-news."
+#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <a href=\"mailto:dwn@debian.org\">%s</a>."
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
#~ "\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <a href=\"mailto:dwn@debian.org\">%s</a>."
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
#~ msgstr ""
-#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
-
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Mai multe informa&#355;ii"
-
-#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Mai multe informa&#355;ii"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "&#206;n discu&#355;ie"
+#~ "<a href=\"../../\">Edi&#355;ii mai vechi</a> ale acestor &#351;tiri sunt "
+#~ "disponibile"
#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "nimic"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "cump&#259;ra&#355;i imagini ISO pre-alc&#259;tuite"
-
-#~ msgid "network install"
-#~ msgstr "instalare de pe internet"
-
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "Vede&#355;i <a href=\"m4_HOME/contact\">pagina de contacte</a> Debian "
-#~ "pentru mai multe informa&#355;ii."
-
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "&#206;napoi la alte <a href=\"./\">&#351;tiri Debian</a>."
-
-#~ msgid "discussed"
-#~ msgstr "discutate"
-
-#~ msgid "Debian on CD"
-#~ msgstr "CD-uri cu Debian"
-
-#~ msgid "Vote"
-#~ msgstr "Vota&#355;i"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Citi&#355;i rezultatul"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Urm&#259;ri&#355;i propunerea"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Amenda&#355;i propunerea"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Propune&#355;i"
-
-#~ msgid "How&nbsp;To"
-#~ msgstr "Cum&nbsp;s&#259;"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Pagina de vot"
-
-#~ msgid "Other"
-#~ msgstr "Altele"
-
-#~ msgid "Withdrawn"
-#~ msgstr "Retras"
-
-#~ msgid "Decided"
-#~ msgstr "Decis"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Vot deschis"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "&#206;n discu&#355;ie"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "A&#351;tept&#226;nd sponsorii"
-
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "&#206;n discu&#355;ie"
-
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "propuse"
+#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
+#~ "debian-news."
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Echipa Debian CD"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (leg&#259;tur&#259; inexistent)"
#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Dona&#355;ii"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />diverse"
-
-#~ msgid "net_install"
-#~ msgstr "instalare de pe internet"
-
-#~ msgid "buy"
-#~ msgstr "cump&#259;ra&#355;i"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "&#206;napoi la <a href=\"m4_HOME/\">pagina principal&#259; Debian</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#~ msgid "Download calendar entry"
+#~ msgstr "Desc&#259;rca&#355;i calendarul"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Latest News"
+#~ msgstr "Ultimele &#351;tiri"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "Related Links"
+#~ msgstr "Link-uri interesante"
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian pe CD"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordonatorul de</th><th>proiect</th>"
-#~ msgid "Debian CD team"
-#~ msgstr "Echipa Debian CD"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordonatorul principal"
-#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
+#~ msgid "Debian Involvement"
+#~ msgstr "Implicarea Debian"
-#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
+#~ msgid "More Info"
+#~ msgstr "Informa&#355;ii suplimentare"
-#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid "Where"
+#~ msgstr "Unde"
-#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
+#~ msgid "When"
+#~ msgstr "C&#238;nd"
-#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid "link may no longer be valid"
+#~ msgstr "trimiterea poate nu mai este valid&#259;"
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "Instalare prin re&#355;ea"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Evenimente viitoare"
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "desc&#259;rcare prin http/ftp"
+#~ msgid "More information"
+#~ msgstr "Mai multe informa&#355;ii"
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "desc&#259;rcare cu jigdo"
+#~ msgid "Rating:"
+#~ msgstr "Cotare:"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Nobody"
+#~ msgstr "Nimeni"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "&#206;napoi la <a href=\"./\">pagina consultan&#355;ilor</a>."
+#~ msgid "Taken by:"
+#~ msgstr "Luat&#259; &#238;n grij&#259; de:"
-#~ msgid "List of Consultants"
-#~ msgstr "Lista consultan&#355;ilor"
+#~ msgid "More information:"
+#~ msgstr "Mai multe informa&#355;ii:"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Vizitați sponsorii"
+#~ msgid "Select a server near you"
+#~ msgstr "Alege&#355;i un server apropiat"
diff --git a/romanian/po/vendors.ro.po b/romanian/po/vendors.ro.po
index b62bd465323..e2927b4d383 100644
--- a/romanian/po/vendors.ro.po
+++ b/romanian/po/vendors.ro.po
@@ -65,75 +65,75 @@ msgstr "sursă"
msgid "and"
msgstr "și"
-#~ msgid "Vendor:"
-#~ msgstr "Distribuitor:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL-ul pentru pagina Debian:"
+#~ msgid "updated monthly"
+#~ msgstr "actualizat&#259; lunar"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Permite contribu&#355;ii la Debian:"
+#~ msgid "updated twice weekly"
+#~ msgstr "actualizat&#259; de dou&#259; ori pe s&#259;pt&#259;m&#226;n&#259;"
-#~ msgid "Country:"
-#~ msgstr "&#354;ar&#259;:"
+#~ msgid "updated weekly"
+#~ msgstr "actualizat&#259; s&#259;pt&#259;m&#226;nal"
-#~ msgid "Ship International:"
-#~ msgstr "Livreaz&#259; interna&#355;ional:"
+#~ msgid "reseller"
+#~ msgstr "re-v&#226;nz&#259;tor"
-#~ msgid "email:"
-#~ msgstr "e-mail:"
+#~ msgid "reseller of $var"
+#~ msgstr "re-v&#226;nz&#259;tor de $var"
-#~ msgid "CD Type:"
-#~ msgstr "Tip de CD:"
+#~ msgid "Custom Release"
+#~ msgstr "Versiune special&#259; pentru client"
-#~ msgid "DVD Type:"
-#~ msgstr "Tip de DVD"
+#~ msgid "vendor additions"
+#~ msgstr "adaosurile distribuitorului"
-#~ msgid "Architectures:"
-#~ msgstr "Arhitecturi:"
+#~ msgid "contrib included"
+#~ msgstr "contribu&#355;ii incluse"
-#~ msgid "Official CD"
-#~ msgstr "CD oficial"
+#~ msgid "non-free included"
+#~ msgstr "non-free inclus"
-#, fuzzy
-#~ msgid "Official DVD"
-#~ msgstr "CD oficial"
+#~ msgid "non-US included"
+#~ msgstr "non-US inclus"
-#~ msgid "Development Snapshot"
-#~ msgstr "Versiunea &#238;n dezvoltare"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Distribu&#355;ie multipl&#259;"
#~ msgid "Vendor Release"
#~ msgstr "Versiune specific&#259; distribuitorului"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Distribu&#355;ie multipl&#259;"
+#~ msgid "Development Snapshot"
+#~ msgstr "Versiunea &#238;n dezvoltare"
-#~ msgid "non-US included"
-#~ msgstr "non-US inclus"
+#, fuzzy
+#~ msgid "Official DVD"
+#~ msgstr "CD oficial"
-#~ msgid "non-free included"
-#~ msgstr "non-free inclus"
+#~ msgid "Official CD"
+#~ msgstr "CD oficial"
-#~ msgid "contrib included"
-#~ msgstr "contribu&#355;ii incluse"
+#~ msgid "Architectures:"
+#~ msgstr "Arhitecturi:"
-#~ msgid "vendor additions"
-#~ msgstr "adaosurile distribuitorului"
+#~ msgid "DVD Type:"
+#~ msgstr "Tip de DVD"
-#~ msgid "Custom Release"
-#~ msgstr "Versiune special&#259; pentru client"
+#~ msgid "CD Type:"
+#~ msgstr "Tip de CD:"
-#~ msgid "reseller of $var"
-#~ msgstr "re-v&#226;nz&#259;tor de $var"
+#~ msgid "email:"
+#~ msgstr "e-mail:"
-#~ msgid "reseller"
-#~ msgstr "re-v&#226;nz&#259;tor"
+#~ msgid "Ship International:"
+#~ msgstr "Livreaz&#259; interna&#355;ional:"
-#~ msgid "updated weekly"
-#~ msgstr "actualizat&#259; s&#259;pt&#259;m&#226;nal"
+#~ msgid "Country:"
+#~ msgstr "&#354;ar&#259;:"
-#~ msgid "updated twice weekly"
-#~ msgstr "actualizat&#259; de dou&#259; ori pe s&#259;pt&#259;m&#226;n&#259;"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permite contribu&#355;ii la Debian:"
-#~ msgid "updated monthly"
-#~ msgstr "actualizat&#259; lunar"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL-ul pentru pagina Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Distribuitor:"
diff --git a/russian/po/blends.ru.po b/russian/po/blends.ru.po
index d6462537027..76f1b6442b6 100644
--- a/russian/po/blends.ru.po
+++ b/russian/po/blends.ru.po
@@ -25,13 +25,26 @@ msgstr "Производные дистрибутивы"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Целью Debian Astro является разработка операционной системы на основе "
+"Debian, которая подходила бы под требования и профессиональных астрономов, и "
+"астрономов-любителей. Эта смесь включает в себя большое число пакетов с "
+"программным обеспечением для управления телескопами, обработки данных, "
+"презентаций и многого другого."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"Целью DebiChem является превращение Debian в хорошую платформу для химиков, "
"которая подходила бы им в их ежедневной работы."
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
@@ -39,7 +52,7 @@ msgstr ""
"Целью Debian Games является предоставление игр в Debian, начиная от аркад и "
"приключений и заканчивая симуляторами и стратегиями."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -47,7 +60,7 @@ msgstr ""
"Целью Debian Edu является превращение операционной системы Debian в систему, "
"подходящую для образовательных целей и использования в школах."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -55,7 +68,7 @@ msgstr ""
"Целью Debian GIS является превращение Debian в лучший дистрибутив для работы "
"с приложениями, связанными с геоинформационными системами."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -63,7 +76,7 @@ msgstr ""
"Целью Debian Junior является превращение Debian в операционную систему, "
"которую с радостью бы использовали дети."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -77,7 +90,7 @@ msgstr ""
"исходным кодом для медицинского сканирования, биоинформатики, клинической ИТ-"
"инфраструктуры и проч. в операционную систему Debian."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -85,7 +98,7 @@ msgstr ""
"Целью Debian Multimedia является превращение Debian в хорошую платформу для "
"работы с аудио и мультимедиа."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -105,26 +118,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Целью Debian Astro является разработка операционной системы на основе "
-"Debian, которая подходила бы под требования и профессиональных астрономов, и "
-"астрономов-любителей. Эта смесь включает в себя большое число пакетов с "
-"программным обеспечением для управления телескопами, обработки данных, "
-"презентаций и многого другого."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Целью Debian Design является предоставление приложений для дизайнеров. Сюда "
"включается графический дизайн, веб-дизайн и дизайн мультимедиа."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -138,7 +138,7 @@ msgstr ""
"целью увеличения возможностей людей и стимуляции развития технологий в таких "
"странах и регионах как Африка, Афганистан, Индонезия, Вьетнам."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -154,7 +154,7 @@ msgstr ""
"собой беспроводной маршрутизатор так, чтобы все данные оставались под "
"властью пользователей."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -163,7 +163,7 @@ msgstr ""
"предоставления приложений для журналирования, режима данных и пакетного "
"режима, а также других целей."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
@@ -171,8 +171,8 @@ msgstr ""
"Целью DebianParl является предоставление приложений для поддержки нужд "
"парламентариев, политиков и их помощников по всему миру."
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian Accessibility"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games"
diff --git a/russian/po/distrib.ru.po b/russian/po/distrib.ru.po
index 9088e40615b..68cd55a3c49 100644
--- a/russian/po/distrib.ru.po
+++ b/russian/po/distrib.ru.po
@@ -206,23 +206,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/russian/po/doc.ru.po b/russian/po/doc.ru.po
index 79dfd3015f6..81e607db45e 100644
--- a/russian/po/doc.ru.po
+++ b/russian/po/doc.ru.po
@@ -17,123 +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/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:37
-msgid "plain text"
-msgstr "простой текст"
-
-#: ../../english/doc/manuals.defs:154
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-msgstr ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
-msgid "Web interface: "
-msgstr "Веб-интерфейс: "
-
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
-msgid "VCS interface: "
-msgstr "VCS-интерфейс: "
-
-#: ../../english/doc/manuals.defs:162
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://packages.debian.org/cvs\">Cvs</a>."
-
-#: ../../english/doc/manuals.defs:170
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/subversion\">Subversion</a> repository."
-msgstr ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://packages.debian.org/subversion\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://packages.debian.org/git\">Git</a>."
-
-#: ../../english/doc/manuals.defs:188
-msgid ""
-"CVS sources working copy: set <code>CVSROOT</code>\n"
-" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr ""
-"Чтобы создать рабочую копию исходных текстов из CVS, установите значение "
-"<code>CVSROOT</code>\n"
-" в <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" и извлеките модуль <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:193
-msgid "CVS via web"
-msgstr "Web-интерфейс CVS"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Пакет Debian"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Пакет Debian (архив)"
-
#: ../../english/doc/books.data:31
msgid ""
"\n"
@@ -299,6 +182,115 @@ msgstr ""
"обнаружения\n"
" проникновений Snort."
+#: ../../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:37
+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>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+" и извлеките модуль <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:193
+msgid "CVS via web"
+msgstr "Web-интерфейс CVS"
+
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+msgid "Debian package"
+msgstr "Пакет Debian"
+
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr "Пакет Debian (архив)"
+
#: ../../english/releases/arches.data:35
msgid "HTML"
msgstr "HTML"
@@ -307,240 +299,124 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 для архитектуры ARM"
-
-#~ msgid ""
-#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
-#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
-#~ "Psion5).\n"
-#~ " It also gives generic information, tools and techniques. The GNU\n"
-#~ " toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ " includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ " coming from other platforms.\n"
-#~ " It is not specific to Debian, but the Aleph\n"
-#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ " will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ " host machine too."
-#~ msgstr ""
-#~ "Эта книга предназначена для разработчиков, работающих c GNU/Linux на "
-#~ "процессорах\n"
-#~ " ARM. Она описывает быструю настройку некоторых специфических устройств "
-#~ "(LART,\n"
-#~ " Assabet, Psion5). Также она даёт общую информацию, приёмы и "
-#~ "инструменты.\n"
-#~ " Описывается инструментарий GNU, как родной, так и для кросс-компиляции, "
-#~ "а также\n"
-#~ " менеджеры загрузки, заплаты к ядру, RAM-диски, специфические "
-#~ "особенности ARM и\n"
-#~ " другие ресурсы по ARM. Также прилагается учебник, освещающий многие "
-#~ "вопросы по основам\n"
-#~ " GNU/Linux для разработчиков, переходящих с других платформ.\n"
-#~ " Книга не относится только к Debian, но дистрибутив Aleph ARMLinux очень "
-#~ "близок к\n"
-#~ " Debian-ARM, на котором основан. Предполагается, что вы будете работать "
-#~ "с этим\n"
-#~ " дистрибутивом, и желательно иметь также доступ к машине под управлением "
-#~ "Debian."
-
-#~ msgid "Language:"
-#~ msgstr "Язык:"
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Чтобы получить исходный текст <get-var ddp_pkg_loc /> в формате SGML,"
-#~ "используйте <a href=\"cvs\">SVN</a>."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD Sarge с установщиком и набором пакетов"
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "Альтернативная <a\n"
-#~ " href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
-#~ "titnr=254925022\">\n"
-#~ " публикация</a> доступна от Lehmanns Fachbuchhandlung, и стоит 29.95\n"
-#~ " &euro; (по состоянию на 2008 год)."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live CD с Knoppix"
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Это та самая нужная книга для вас, чтобы научиться создавать простые и "
-#~ "сложные IT платформы, используя только Свободное ПО. Внутри вы найдёте "
-#~ "широкий спектр процедур, которые детально рассмотрены и приспособлены к "
-#~ "тому, чтобы подойти лучшим практикам воплощения технологической "
-#~ "инфраструктуры. Её легко читать, и она представляет собой всестороннее "
-#~ "руководство по достижению конкретных целей с операционной системой Debian "
-#~ "GNU/Linux."
+#~ "Новички и опытные пользователи найдут эту книгу исчерпывающим источником\n"
+#~ " информации по использованию Debian на рабочих станциях, серверах "
+#~ "локальных\n"
+#~ " и глобальных сетей и для разработки. Она также содержит общую\n"
+#~ " информацию о проекте и всесторонний обзор уникальной системы "
+#~ "управления\n"
+#~ " пакетами Debian."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Эта книга поделена на четыре части: основные концепции, управление\n"
-#~ " GNU/Linux, администрирование системы и дополнительные возможности.\n"
-#~ " Каждая глава глубоко раскрывает возможности операционной системы.\n"
-#~ " Первые главы описывает структуру GNU/Linux. Они помогают читателю\n"
-#~ " понять, как система использует основные ресурсы, такие как процессор и\n"
-#~ " память. Детальный анализ файловых систем Ext2, Ext3 и ReiserFS "
-#~ "позволит\n"
-#~ " пользователям сделать правильный выбор, основанный на их нуждах.\n"
-#~ " В книге содержится множество рисунков, показывающих все аспекты\n"
-#~ " производительности системы. Книга будет полезна студентам средних и "
-#~ "высших\n"
-#~ " специальных учебных заведений, а также всем, кто хочет глубже изучить\n"
-#~ " GNU/Linux. В книге описывается Debian Sarge."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "официальный выпуск Debian GNU/Linux 3.1r0a «sarge» на DVD (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Это первая книга о Debian GNU/Linux на персидском языке. Эта книга "
-#~ "поможет\n"
-#~ " вам установить Debian GNU/Linux и установить на нём такие сетевые "
-#~ "сервисы\n"
-#~ " как web, database, firewall, mail, ftp и тд. Кроме того, она поможет "
-#~ "вам\n"
-#~ " начать пользоваться GNU/Linux и мощной системой управления пакетами "
-#~ "Debian."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Эта книга представляет концепции и технологии операционной системы "
+#~ "Debian,\n"
+#~ " объясняя их использование и подвохи, и объясняет образ мышления, "
+#~ "лежащий за\n"
+#~ " каждым из подходов. Её цель состоит не в том, чтобы быть справочником, "
+#~ "а в том, чтобы\n"
+#~ " дать читателю достаточное понимание о работе проекта и операционной\n"
+#~ " системы, чтобы изучить и объять утончённые и изящные, иногда сразу\n"
+#~ " не очевидные решения, которые развивались как часть системы Debian\n"
+#~ " за прошлое десятилетие. Хотя книга предназначается опытным "
+#~ "администраторам\n"
+#~ " UNIX/Linux, она также может служить хорошим дополнением к стандартному\n"
+#~ " справочнику по Linux, позволяя сравнить восприятие Linux с восходящей\n"
+#~ " философией Debian."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Эта книга содержит введение в Debian GNU/Linux, много практического "
-#~ "учебного\n"
-#~ " материала и советов. Она написана на корейском языке, и покрывает все\n"
-#~ " стороны системы Debian GNU/Linux: первая установка, установка пакетов,\n"
-#~ " настройка X, соединение с Интернет, администрирование сети и другие "
-#~ "вопросы.\n"
-#~ " Книга содержит советы по настройке корейской среды в Debian, и это "
-#~ "также\n"
-#~ " полезно для новичков."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Три официальных CD с potato r3 и неофициальный CD с woody"
+#~ "Практическое справочное руководство по системе Debian GNU/Linux, "
+#~ "показывающее\n"
+#~ " в более чем 1&nbsp;500 <q>рецептах</q>, как использовать систему в "
+#~ "повседневной\n"
+#~ " деятельности &mdash; от работы с текстом, изображениями и звуком, до "
+#~ "вопросов\n"
+#~ " производительности и работы в сети. Как и программное обеспечение, "
+#~ "описанное\n"
+#~ " в книге, сама книга защищена антикопирайтом (copyleft), доступны все "
+#~ "её\n"
+#~ " полные исходные данные."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Эта книга даёт краткое руководство по установке Debian GNU/Linux, "
-#~ "основным\n"
-#~ " командам Unix и Linux, первичной настройке и сопровождению системы и "
-#~ "сети,\n"
-#~ " настройке системы X Window и использованию мультимедиа в Debian GNU/"
-#~ "Linux.\n"
-#~ " Эта книга включает также руководство для сопровождающих, чтобы больше\n"
-#~ " корейцев могли стать официальными сопровождающими Debian."
+#~ "Это руководство для нового пользователя Linux, проводящее его через "
+#~ "процессы\n"
+#~ " установки и настройки Debian GNU/Linux. Для пользователей Windows книга "
+#~ "Билла\n"
+#~ " МакКарти <q>Изучаем Debian GNU/Linux</q> будет мягким введением в этот "
+#~ "восхитительный мир."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 — с официальным выпуском Woody, 3 — Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Эта книга описывает основные вопросы, касающиеся Debian GNU/Linux: "
-#~ "установка,\n"
-#~ " APT и dpkg, оболочка, система X Window, работа в сети, "
-#~ "администрирование\n"
-#~ " системы, настройка ядра, взаимодействие с Windows, построение серверов "
-#~ "и т.п.\n"
-#~ " Вы сможете очень легко установить и начать использование японской среды "
-#~ "Debian\n"
-#~ " GNU/Linux с помощью прилагаемых авторских компакт-дисков."
+#~ "Содержит 230 с лишним страниц и три компакт-диска. Освещаются такие темы, "
+#~ "как ПО, включённое в\n"
+#~ " Debian Linux, работа в сети, инструменты для программиста, графический "
+#~ "интерфейс,\n"
+#~ " системы вёрстки, программы для бизнеса, развлечения и мультимедиа. "
+#~ "Включена тридцатидневная бесплатная\n"
+#~ " техническая поддержка по электронной почте."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 авторский выпуск (3 CD)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Это последняя книга о Sarge из серии, которая исполняет роль библии\n"
-#~ " о Debian в Японии.\n"
-#~ " Эта книга раскрывает все стороны использования Debian GNU/Linux 3.1 "
-#~ "Sarge,\n"
-#~ " такие как установка, окружения рабочего стола, системное "
-#~ "администрирование\n"
-#~ " и настройка сервера. Более того, к этой книге прилагается пакет "
-#~ "коммерческих\n"
-#~ " шрифтов, которые украсят ваш рабочий стол. Эта книга может оказаться "
-#~ "полезной\n"
-#~ " для всех пользователей Debian, от новичков до опытных пользователей."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 варианта: один без DVD, другой с 2-мя DVD (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr ""
-#~ "Debian GNU/Linux 3.1r0 i386, авторский выпуск (DVD +\n"
-#~ " CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 и amd64) на DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Это книга в стиле словаря, и содержит различные советы для новичков\n"
-#~ " и чуть более опытных пользователей. Рассмотрены установка различными \n"
-#~ " методами настройка рабочего стола, разрешение проблем, полезные секреты "
-#~ "и\n"
-#~ " тому подобное."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Установщик Debian GNU/Linux 3.1 Sarge (один CD)"
+#~ "2 варианта: один без CD, другой с официальным CD (i386, contrib и sources)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -579,121 +455,244 @@ msgstr "PDF"
#~ "маршрутизатора или\n"
#~ " сервера для клиентов под управлением Windows (Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Установщик Debian GNU/Linux 3.1 Sarge (один CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "2 варианта: один без CD, другой с официальным CD (i386, contrib и sources)"
+#~ "Это книга в стиле словаря, и содержит различные советы для новичков\n"
+#~ " и чуть более опытных пользователей. Рассмотрены установка различными \n"
+#~ " методами настройка рабочего стола, разрешение проблем, полезные секреты "
+#~ "и\n"
+#~ " тому подобное."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 и amd64) на DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr ""
+#~ "Debian GNU/Linux 3.1r0 i386, авторский выпуск (DVD +\n"
+#~ " CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 варианта: один без DVD, другой с 2-мя DVD (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Это последняя книга о Sarge из серии, которая исполняет роль библии\n"
+#~ " о Debian в Японии.\n"
+#~ " Эта книга раскрывает все стороны использования Debian GNU/Linux 3.1 "
+#~ "Sarge,\n"
+#~ " такие как установка, окружения рабочего стола, системное "
+#~ "администрирование\n"
+#~ " и настройка сервера. Более того, к этой книге прилагается пакет "
+#~ "коммерческих\n"
+#~ " шрифтов, которые украсят ваш рабочий стол. Эта книга может оказаться "
+#~ "полезной\n"
+#~ " для всех пользователей Debian, от новичков до опытных пользователей."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 авторский выпуск (3 CD)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Содержит 230 с лишним страниц и три компакт-диска. Освещаются такие темы, "
-#~ "как ПО, включённое в\n"
-#~ " Debian Linux, работа в сети, инструменты для программиста, графический "
-#~ "интерфейс,\n"
-#~ " системы вёрстки, программы для бизнеса, развлечения и мультимедиа. "
-#~ "Включена тридцатидневная бесплатная\n"
-#~ " техническая поддержка по электронной почте."
+#~ "Эта книга описывает основные вопросы, касающиеся Debian GNU/Linux: "
+#~ "установка,\n"
+#~ " APT и dpkg, оболочка, система X Window, работа в сети, "
+#~ "администрирование\n"
+#~ " системы, настройка ядра, взаимодействие с Windows, построение серверов "
+#~ "и т.п.\n"
+#~ " Вы сможете очень легко установить и начать использование японской среды "
+#~ "Debian\n"
+#~ " GNU/Linux с помощью прилагаемых авторских компакт-дисков."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 — с официальным выпуском Woody, 3 — Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "Это руководство для нового пользователя Linux, проводящее его через "
-#~ "процессы\n"
-#~ " установки и настройки Debian GNU/Linux. Для пользователей Windows книга "
-#~ "Билла\n"
-#~ " МакКарти <q>Изучаем Debian GNU/Linux</q> будет мягким введением в этот "
-#~ "восхитительный мир."
+#~ "Эта книга даёт краткое руководство по установке Debian GNU/Linux, "
+#~ "основным\n"
+#~ " командам Unix и Linux, первичной настройке и сопровождению системы и "
+#~ "сети,\n"
+#~ " настройке системы X Window и использованию мультимедиа в Debian GNU/"
+#~ "Linux.\n"
+#~ " Эта книга включает также руководство для сопровождающих, чтобы больше\n"
+#~ " корейцев могли стать официальными сопровождающими Debian."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Три официальных CD с potato r3 и неофициальный CD с woody"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Практическое справочное руководство по системе Debian GNU/Linux, "
-#~ "показывающее\n"
-#~ " в более чем 1&nbsp;500 <q>рецептах</q>, как использовать систему в "
-#~ "повседневной\n"
-#~ " деятельности &mdash; от работы с текстом, изображениями и звуком, до "
-#~ "вопросов\n"
-#~ " производительности и работы в сети. Как и программное обеспечение, "
-#~ "описанное\n"
-#~ " в книге, сама книга защищена антикопирайтом (copyleft), доступны все "
-#~ "её\n"
-#~ " полные исходные данные."
+#~ "Эта книга содержит введение в Debian GNU/Linux, много практического "
+#~ "учебного\n"
+#~ " материала и советов. Она написана на корейском языке, и покрывает все\n"
+#~ " стороны системы Debian GNU/Linux: первая установка, установка пакетов,\n"
+#~ " настройка X, соединение с Интернет, администрирование сети и другие "
+#~ "вопросы.\n"
+#~ " Книга содержит советы по настройке корейской среды в Debian, и это "
+#~ "также\n"
+#~ " полезно для новичков."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Эта книга представляет концепции и технологии операционной системы "
-#~ "Debian,\n"
-#~ " объясняя их использование и подвохи, и объясняет образ мышления, "
-#~ "лежащий за\n"
-#~ " каждым из подходов. Её цель состоит не в том, чтобы быть справочником, "
-#~ "а в том, чтобы\n"
-#~ " дать читателю достаточное понимание о работе проекта и операционной\n"
-#~ " системы, чтобы изучить и объять утончённые и изящные, иногда сразу\n"
-#~ " не очевидные решения, которые развивались как часть системы Debian\n"
-#~ " за прошлое десятилетие. Хотя книга предназначается опытным "
-#~ "администраторам\n"
-#~ " UNIX/Linux, она также может служить хорошим дополнением к стандартному\n"
-#~ " справочнику по Linux, позволяя сравнить восприятие Linux с восходящей\n"
-#~ " философией Debian."
+#~ "Это первая книга о Debian GNU/Linux на персидском языке. Эта книга "
+#~ "поможет\n"
+#~ " вам установить Debian GNU/Linux и установить на нём такие сетевые "
+#~ "сервисы\n"
+#~ " как web, database, firewall, mail, ftp и тд. Кроме того, она поможет "
+#~ "вам\n"
+#~ " начать пользоваться GNU/Linux и мощной системой управления пакетами "
+#~ "Debian."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "официальный выпуск Debian GNU/Linux 3.1r0a «sarge» на DVD (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Эта книга поделена на четыре части: основные концепции, управление\n"
+#~ " GNU/Linux, администрирование системы и дополнительные возможности.\n"
+#~ " Каждая глава глубоко раскрывает возможности операционной системы.\n"
+#~ " Первые главы описывает структуру GNU/Linux. Они помогают читателю\n"
+#~ " понять, как система использует основные ресурсы, такие как процессор и\n"
+#~ " память. Детальный анализ файловых систем Ext2, Ext3 и ReiserFS "
+#~ "позволит\n"
+#~ " пользователям сделать правильный выбор, основанный на их нуждах.\n"
+#~ " В книге содержится множество рисунков, показывающих все аспекты\n"
+#~ " производительности системы. Книга будет полезна студентам средних и "
+#~ "высших\n"
+#~ " специальных учебных заведений, а также всем, кто хочет глубже изучить\n"
+#~ " GNU/Linux. В книге описывается Debian Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Новички и опытные пользователи найдут эту книгу исчерпывающим источником\n"
-#~ " информации по использованию Debian на рабочих станциях, серверах "
-#~ "локальных\n"
-#~ " и глобальных сетей и для разработки. Она также содержит общую\n"
-#~ " информацию о проекте и всесторонний обзор уникальной системы "
-#~ "управления\n"
-#~ " пакетами Debian."
+#~ "Это та самая нужная книга для вас, чтобы научиться создавать простые и "
+#~ "сложные IT платформы, используя только Свободное ПО. Внутри вы найдёте "
+#~ "широкий спектр процедур, которые детально рассмотрены и приспособлены к "
+#~ "тому, чтобы подойти лучшим практикам воплощения технологической "
+#~ "инфраструктуры. Её легко читать, и она представляет собой всестороннее "
+#~ "руководство по достижению конкретных целей с операционной системой Debian "
+#~ "GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live CD с Knoppix"
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Альтернативная <a\n"
+#~ " href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
+#~ "titnr=254925022\">\n"
+#~ " публикация</a> доступна от Lehmanns Fachbuchhandlung, и стоит 29.95\n"
+#~ " &euro; (по состоянию на 2008 год)."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD Sarge с установщиком и набором пакетов"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Чтобы получить исходный текст <get-var ddp_pkg_loc /> в формате SGML,"
+#~ "используйте <a href=\"cvs\">SVN</a>."
+
+#~ msgid "Language:"
+#~ msgstr "Язык:"
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Эта книга предназначена для разработчиков, работающих c GNU/Linux на "
+#~ "процессорах\n"
+#~ " ARM. Она описывает быструю настройку некоторых специфических устройств "
+#~ "(LART,\n"
+#~ " Assabet, Psion5). Также она даёт общую информацию, приёмы и "
+#~ "инструменты.\n"
+#~ " Описывается инструментарий GNU, как родной, так и для кросс-компиляции, "
+#~ "а также\n"
+#~ " менеджеры загрузки, заплаты к ядру, RAM-диски, специфические "
+#~ "особенности ARM и\n"
+#~ " другие ресурсы по ARM. Также прилагается учебник, освещающий многие "
+#~ "вопросы по основам\n"
+#~ " GNU/Linux для разработчиков, переходящих с других платформ.\n"
+#~ " Книга не относится только к Debian, но дистрибутив Aleph ARMLinux очень "
+#~ "близок к\n"
+#~ " Debian-ARM, на котором основан. Предполагается, что вы будете работать "
+#~ "с этим\n"
+#~ " дистрибутивом, и желательно иметь также доступ к машине под управлением "
+#~ "Debian."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 для архитектуры ARM"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Наиболее свежий исходный код <get-var srctype /> доступен из репозитория "
+#~ "<a href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
diff --git a/russian/po/l10n.ru.po b/russian/po/l10n.ru.po
index c59c7f6d82f..cbafe20c3e1 100644
--- a/russian/po/l10n.ru.po
+++ b/russian/po/l10n.ru.po
@@ -3,6 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml l10n\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2017-12-10 16:07+0500\n"
"Last-Translator: Lev Lamberov <dogsleg@debian.org>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -13,7 +14,6 @@ msgstr ""
"X-Generator: Poedit 2.0.4\n"
"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"
-"POT-Creation-Date: \n"
#: ../../english/international/l10n/dtc.def:10
msgid "File"
diff --git a/russian/po/mailinglists.ru.po b/russian/po/mailinglists.ru.po
index c5c1c4150cd..1206e737e32 100644
--- a/russian/po/mailinglists.ru.po
+++ b/russian/po/mailinglists.ru.po
@@ -135,8 +135,8 @@ msgstr "открытая"
msgid "closed"
msgstr "закрытая"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "выберите списки от которых вы хотите отписаться:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Выберите списки рассылки на которые вы хотели бы подписаться:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "выберите списки от которых вы хотите отписаться:"
diff --git a/russian/po/organization.ru.po b/russian/po/organization.ru.po
index 1559f565d71..46e07f148c5 100644
--- a/russian/po/organization.ru.po
+++ b/russian/po/organization.ru.po
@@ -50,13 +50,13 @@ msgid "manager"
msgstr "менеджер"
#: ../../english/intro/organization.data:34
-msgid "Stable Release 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:36
msgid "wizard"
msgstr "мастер"
@@ -79,22 +79,22 @@ msgid "Officers"
msgstr "Руководство"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Дистрибутив"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr "Информационное взаимодействие и социально-ориентированные программы"
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Связи с общественностью"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Поддержка и инфраструктура"
@@ -111,179 +111,179 @@ msgstr "Лидер"
msgid "Technical Committee"
msgstr "Технический Комитет"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Секретарь"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Проекты"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP-архив"
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Менеджер FTP-архива"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Помощники менеджера FTP-архива"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Мастера настройки FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Команда Backports"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Отдельные пакеты"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Управление выпусками"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Команда подготовки выпуска"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Контроль качества"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Команда создания системы установки"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Информация о выпусках"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Образы CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Производство"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Тестирование"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Инфраструктура автоматической сборки"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Команда поддержки wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Управление buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Документация"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Список нуждающихся в доработке и будущих пакетов"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr "Команда Debian Live"
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Переносы"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Особые варианты"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Переносные компьютеры"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Брандмауэры"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Встроенные системы"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Связи с прессой"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Web-страницы"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Планета Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Агитационная компания"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Женщины в проекте Debian"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Борьба с притеснениями"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "События"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "Комитет DebConf"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Партнёрская программа"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Координация пожертвования аппаратным обеспечением"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Поддержка пользователей"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Система отслеживания ошибок"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Администрирование и архивы списков рассылки"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Регистрационный стол новых членов"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Менеджеры учётных записей Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -291,31 +291,31 @@ msgstr ""
"Чтобы отправить личное сообщение всем менеджерам учётных записей, "
"используйте GPG-ключ 57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Сопровождающие сети ключей (PGP и GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Команда безопасности"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Консультанты"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Поставщики CD"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Политика"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Администрирование систем"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -324,7 +324,7 @@ msgstr ""
"Debian, в том числе проблем с паролями или при необходимости установки "
"пакета."
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -334,125 +334,125 @@ msgstr ""
"страницу <a href=\"https://db.debian.org/machines.cgi\">Машины Debian</a>. "
"Там должна быть информация об администраторе каждой конкретной машины."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Администратор каталога разработчиков LDAP"
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Зеркала"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Сопровождающий DNS"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Система отслеживания пакетов"
-#: ../../english/intro/organization.data:441
+#: ../../english/intro/organization.data:444
msgid "Treasurer"
msgstr "Казначей"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:450
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:450
+#: ../../english/intro/organization.data:453
msgid "Salsa administrators"
msgstr "Администраторы Salsa"
-#: ../../english/intro/organization.data:454
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Администраторы Alioth"
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian для детей от 1 до 99"
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian в медицинской практике и исследованиях"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian в образовании"
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian в юридической конторе"
-#: ../../english/intro/organization.data:482
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian для людей с ограниченными возможностями"
-#: ../../english/intro/organization.data:486
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian в науке и связанных исследованиях"
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:492
msgid "Debian for astronomy"
msgstr "Debian в астрономии"
-#~ msgid "Bits from Debian"
-#~ msgstr "Bits from Debian"
-
-#~ msgid "Testing Security Team"
-#~ msgstr "Команда безопасности тестируемого дистрибутива"
+#~ msgid "Auditor"
+#~ msgstr "Контролёр"
-#~ msgid "Security Audit Project"
-#~ msgstr "Проект всесторонней проверки безопасности"
+#~ msgid "Live System Team"
+#~ msgstr "Команда подготовки Live-выпуска"
-#~ msgid "Volatile Team"
-#~ msgstr "Команда поддержки часто меняющихся частей дистрибутива (volatile)"
+#~ msgid "Publicity"
+#~ msgstr "Связи с общественностью"
-#~ msgid "Vendors"
-#~ msgstr "Поставщики"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Сопровождающие связки ключей Сопровождающих Debian (DM)"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Пользовательские дистрибутивы Debian"
+#~ msgid "DebConf chairs"
+#~ msgstr "Председатели DebConf"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Команда подготовки стабильного выпуска"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "текущий Лидер Проекта Debian"
-#~ msgid "Handhelds"
-#~ msgstr "Карманные компьютеры"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Администраторы Summer of Code 2013"
-#~ msgid "Marketing Team"
-#~ msgstr "Команда работы с рынком"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian в некоммерческих организациях"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Координация подписи ключей"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Универсальная операционная система на настольном компьютере"
#~ msgid "Accountant"
#~ msgstr "Учётные записи"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Универсальная операционная система на настольном компьютере"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Координация подписи ключей"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian в некоммерческих организациях"
+#~ msgid "Marketing Team"
+#~ msgstr "Команда работы с рынком"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Администраторы Summer of Code 2013"
+#~ msgid "Handhelds"
+#~ msgstr "Карманные компьютеры"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "текущий Лидер Проекта Debian"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Команда подготовки стабильного выпуска"
-#~ msgid "DebConf chairs"
-#~ msgstr "Председатели DebConf"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Пользовательские дистрибутивы Debian"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Сопровождающие связки ключей Сопровождающих Debian (DM)"
+#~ msgid "Vendors"
+#~ msgstr "Поставщики"
-#~ msgid "Publicity"
-#~ msgstr "Связи с общественностью"
+#~ msgid "Volatile Team"
+#~ msgstr "Команда поддержки часто меняющихся частей дистрибутива (volatile)"
-#~ msgid "Live System Team"
-#~ msgstr "Команда подготовки Live-выпуска"
+#~ msgid "Security Audit Project"
+#~ msgstr "Проект всесторонней проверки безопасности"
-#~ msgid "Auditor"
-#~ msgstr "Контролёр"
+#~ msgid "Testing Security Team"
+#~ msgstr "Команда безопасности тестируемого дистрибутива"
+
+#~ msgid "Bits from Debian"
+#~ msgstr "Bits from Debian"
diff --git a/russian/po/others.ru.po b/russian/po/others.ru.po
index 9f28bbf501a..7990912b5a6 100644
--- a/russian/po/others.ru.po
+++ b/russian/po/others.ru.po
@@ -335,17 +335,17 @@ msgstr "Версия"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "Где:"
+#~ msgid "Wanted:"
+#~ msgstr "Требуется:"
-#~ msgid "Specifications:"
-#~ msgstr "Спецификация:"
+#~ msgid "Who:"
+#~ msgstr "Требуется для:"
#~ msgid "Architecture:"
#~ msgstr "Архитектура:"
-#~ msgid "Who:"
-#~ msgstr "Требуется для:"
+#~ msgid "Specifications:"
+#~ msgstr "Спецификация:"
-#~ msgid "Wanted:"
-#~ msgstr "Требуется:"
+#~ msgid "Where:"
+#~ msgstr "Где:"
diff --git a/russian/po/partners.ru.po b/russian/po/partners.ru.po
index 641f7056fec..c90de43b3e4 100644
--- a/russian/po/partners.ru.po
+++ b/russian/po/partners.ru.po
@@ -689,14 +689,29 @@ msgstr ""
"открытые исходные коды."
#~ msgid ""
-#~ "credativ is a service oriented company focusing on open-source software "
-#~ "since its foundation in 1999. World-wide Debian support is provided by "
-#~ "credativ's <q>Open Source Support Centers</q> around the globe."
+#~ "They are a leading Internet Service Provider (ISP) in the United Kingdom "
+#~ "and provide scalable, powerful and affordable hosting with lots of "
+#~ "<q>geek friendly</q> extras as standard. Debian GNU/Linux is deployed "
+#~ "extensively within their network, and comes recommended as the "
+#~ "<q>Distribution of Choice</q> to any new customer who's not 100% sure on "
+#~ "what to pick."
#~ msgstr ""
-#~ "credativ &mdash; компания, ориентированная на предоставление услуг, "
-#~ "занимающаяся ПО с открытым исходным кодом с момента своего основания в "
-#~ "1999 году. Поддержка Debian предоставляется центрами <q>Open Source "
-#~ "Support Center</q> компании credativ по всему миру."
+#~ "Они являются лидирующим Интернет-провайдером (ISP) Великобритании, и "
+#~ "предоставляют масштабируемый, мощный и доступный хостинг с большим "
+#~ "количеством <q>дружественных гикам</q> расширений в качестве стандарта "
+#~ "(Прим. пер.: geek&nbsp;&mdash; одержимый компьютерными технологиями). "
+#~ "Debian GNU/Linux широко развёрнут внутри их сети и рекомендуется как "
+#~ "<q>Лучший Дистрибутив</q> многим новым клиентам, которые не уверены в "
+#~ "выборе на 100%."
+
+#~ msgid ""
+#~ "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
+#~ "support us by providing hosting services and sponsorship for the Debian "
+#~ "Conference."
+#~ msgstr ""
+#~ "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
+#~ "поддерживает нас, предоставляя услуги хостинга и спонсорство конференций "
+#~ "Debian."
#~ msgid ""
#~ "A large number of credativ staff are Debian developers, several of them "
@@ -710,26 +725,11 @@ msgstr ""
#~ "информации обратитесь по адресу: <url \"http://www.credativ.com/\">."
#~ msgid ""
-#~ "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-#~ "support us by providing hosting services and sponsorship for the Debian "
-#~ "Conference."
-#~ msgstr ""
-#~ "<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-#~ "поддерживает нас, предоставляя услуги хостинга и спонсорство конференций "
-#~ "Debian."
-
-#~ msgid ""
-#~ "They are a leading Internet Service Provider (ISP) in the United Kingdom "
-#~ "and provide scalable, powerful and affordable hosting with lots of "
-#~ "<q>geek friendly</q> extras as standard. Debian GNU/Linux is deployed "
-#~ "extensively within their network, and comes recommended as the "
-#~ "<q>Distribution of Choice</q> to any new customer who's not 100% sure on "
-#~ "what to pick."
+#~ "credativ is a service oriented company focusing on open-source software "
+#~ "since its foundation in 1999. World-wide Debian support is provided by "
+#~ "credativ's <q>Open Source Support Centers</q> around the globe."
#~ msgstr ""
-#~ "Они являются лидирующим Интернет-провайдером (ISP) Великобритании, и "
-#~ "предоставляют масштабируемый, мощный и доступный хостинг с большим "
-#~ "количеством <q>дружественных гикам</q> расширений в качестве стандарта "
-#~ "(Прим. пер.: geek&nbsp;&mdash; одержимый компьютерными технологиями). "
-#~ "Debian GNU/Linux широко развёрнут внутри их сети и рекомендуется как "
-#~ "<q>Лучший Дистрибутив</q> многим новым клиентам, которые не уверены в "
-#~ "выборе на 100%."
+#~ "credativ &mdash; компания, ориентированная на предоставление услуг, "
+#~ "занимающаяся ПО с открытым исходным кодом с момента своего основания в "
+#~ "1999 году. Поддержка Debian предоставляется центрами <q>Open Source "
+#~ "Support Center</q> компании credativ по всему миру."
diff --git a/russian/po/ports.ru.po b/russian/po/ports.ru.po
index a28bea8744a..37b4b8a3d72 100644
--- a/russian/po/ports.ru.po
+++ b/russian/po/ports.ru.po
@@ -118,32 +118,32 @@ msgstr "Debian для PowerPC"
msgid "Debian for Sparc"
msgstr "Debian для Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian для переносных компьютеров"
-
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian для Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian для 64-разрядной архитектуры AMD"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian для S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian для ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian для MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian для Beowulf"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian для Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Основная"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Main"
-#~ msgstr "Основная"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian для Motorola 680x0"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian для Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian для MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian для ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian для S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian для 64-разрядной архитектуры AMD"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian для Sparc64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian для переносных компьютеров"
diff --git a/russian/po/stats.ru.po b/russian/po/stats.ru.po
index 45dc181209b..c8559af4494 100644
--- a/russian/po/stats.ru.po
+++ b/russian/po/stats.ru.po
@@ -15,79 +15,106 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
-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."
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Неверная версия перевода"
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Этот перевод слишком устарел"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Оригинал новее, чем перевод"
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Оригинал более не существует"
-#: ../../stattrans.pl:413
-msgid "hits"
-msgstr "обращения"
-
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "число обращений не доступно"
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:482
+msgid "hits"
+msgstr "обращения"
+
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Нажмите, чтобы получить данные diffstat"
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Унифицированный diff"
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Цветной diff"
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Цветной diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Создано с помощью <transstatslink>"
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Резюме перевода для"
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
+msgid "Not translated"
+msgstr "Не переведено"
+
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
+msgid "Outdated"
+msgstr "Устарело"
+
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Переведено"
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Актуально"
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
-msgid "Outdated"
-msgstr "Устарело"
-
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
-msgid "Not translated"
-msgstr "Не переведено"
-
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "файлы"
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "байты"
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -95,152 +122,136 @@ msgstr ""
"Замечание: список страниц отсортирован по популярности. Наведите указатель "
"мыши на название страницы, чтобы увидеть количество обращений."
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Устаревшие переводы"
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Файл"
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Комментарий"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Журнал"
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Перевод"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Сопровождающий"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Состояние"
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Переводчик"
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Дата"
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Не переведённые страницы общего характера"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Не переведённые страницы общего характера"
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Не переведённые новости"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Не переведённые новости"
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Не переведённые страницы о консультантах/пользователях"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Не переведённые страницы консультантов/пользователей"
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Не переведённые международные страницы"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Не переведённые международные страницы"
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Переведённые страницы (актуальные)"
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Переведённые шаблоны (файлы PO)"
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Статистика перевода PO"
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Неточные"
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Не переведено"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Всего"
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Всего:"
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Переведённые веб-страницы"
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Статистика перевода по счетчику страниц"
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Язык"
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Переводы"
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Переведённые веб-страницы (по размеру)"
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
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 "Hit data from %s, gathered %s."
+#~ msgstr "Данные о посещениях с %s, собраны %s."
#~ msgid "Created with"
#~ msgstr "Создано с помощью"
-
-#~ msgid "Hit data from %s, gathered %s."
-#~ msgstr "Данные о посещениях с %s, собраны %s."
diff --git a/russian/po/templates.ru.po b/russian/po/templates.ru.po
index 960ce3334d6..3d91ff1f5ab 100644
--- a/russian/po/templates.ru.po
+++ b/russian/po/templates.ru.po
@@ -18,6 +18,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/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"
@@ -197,12 +205,19 @@ msgstr "в выпуске 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Чтобы сообщить о проблеме, связанной с веб-сайтом, отправьте сообщение (на "
"английском) в публичный список рассылки по адресу <a href=\"mailto:debian-"
@@ -502,6 +517,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Замечание:</em> Оригинал этого документа больше не существует."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -510,34 +529,26 @@ 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;спонсора"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Проблема с отображением сайта?"
+#~ msgid "Rating:"
+#~ msgstr "Рейтинг:"
-#~ msgid "Report it!"
-#~ msgstr "Сообщите об этом!"
+#~ msgid "Nobody"
+#~ msgstr "Никем"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Выберите ближайший сервер: &nbsp;"
+#~ msgid "Taken by:"
+#~ msgstr "Ответственный"
#~ msgid "More information:"
#~ msgstr "Подробнее:"
-#~ msgid "Taken by:"
-#~ msgstr "Ответственный"
-
-#~ msgid "Nobody"
-#~ msgstr "Никем"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Выберите ближайший сервер: &nbsp;"
-#~ msgid "Rating:"
-#~ msgstr "Рейтинг:"
+#~ msgid "Report it!"
+#~ msgstr "Сообщите об этом!"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Посетите&nbsp;нашего&nbsp;спонсора"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Проблема с отображением сайта?"
diff --git a/russian/po/vendors.ru.po b/russian/po/vendors.ru.po
index ea54e2bd219..2e2a5cadf4a 100644
--- a/russian/po/vendors.ru.po
+++ b/russian/po/vendors.ru.po
@@ -69,35 +69,35 @@ msgstr "исходный код"
msgid "and"
msgstr "и"
-#~ msgid "Architectures:"
-#~ msgstr "Архитектуры:"
+#~ msgid "Vendor:"
+#~ msgstr "Поставщик:"
-#~ msgid "USB Type:"
-#~ msgstr "Тип USB:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL страницы Debian:"
-#~ msgid "BD Type:"
-#~ msgstr "Тип BD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Жертвует часть дохода Debian:"
-#~ msgid "DVD Type:"
-#~ msgstr "Тип DVD:"
+#~ msgid "Country:"
+#~ msgstr "Страна:"
-#~ msgid "CD Type:"
-#~ msgstr "Тип CD:"
+#~ msgid "Ship International:"
+#~ msgstr "Международные поставки:"
#~ msgid "email:"
#~ msgstr "e-mail:"
-#~ msgid "Ship International:"
-#~ msgstr "Международные поставки:"
+#~ msgid "CD Type:"
+#~ msgstr "Тип CD:"
-#~ msgid "Country:"
-#~ msgstr "Страна:"
+#~ msgid "DVD Type:"
+#~ msgstr "Тип DVD:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Жертвует часть дохода Debian:"
+#~ msgid "BD Type:"
+#~ msgstr "Тип BD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL страницы Debian:"
+#~ msgid "USB Type:"
+#~ msgstr "Тип USB:"
-#~ msgid "Vendor:"
-#~ msgstr "Поставщик:"
+#~ msgid "Architectures:"
+#~ msgstr "Архитектуры:"
diff --git a/slovak/po/blends.sk.po b/slovak/po/blends.sk.po
index c98cde9a103..54782630b11 100644
--- a/slovak/po/blends.sk.po
+++ b/slovak/po/blends.sk.po
@@ -24,13 +24,21 @@ msgstr "Odvodené distribúcie"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"Cieľom DebiChem je urobiť z Debianu dobrú platformu pre chemikov v rámci ich "
"každodennej práce."
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
@@ -38,7 +46,7 @@ msgstr ""
"Cieľom Debian Games je poskytnúť v rámci Debianu hry od arkádových a "
"dobrodružných po simulačné a strategické."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -46,19 +54,19 @@ msgstr ""
"Cieľom Debian Edu je poskytnúť OS Debian vhodný na vzdelávacie účely a "
"použitie v školách."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -66,13 +74,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -87,19 +95,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -108,7 +108,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -117,13 +117,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/slovak/po/bugs.sk.po b/slovak/po/bugs.sk.po
index 053a5de22e3..2a5d09c4222 100644
--- a/slovak/po/bugs.sk.po
+++ b/slovak/po/bugs.sk.po
@@ -160,143 +160,143 @@ msgstr "Archivované"
msgid "Archived and Unarchived"
msgstr "Archivované aj nearchivované"
-#~ msgid "Flags:"
-#~ msgstr "Príznaky:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Okrem značky:"
-#~ msgid "active bugs"
-#~ msgstr "aktívne chyby"
+#~ msgid "Include tag:"
+#~ msgstr "So značkou:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "zobrazovať zlúčené chyby iba raz"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "nezoraovať podľa stavu či závažnosti"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "nezobrazovať obsah v hlavičke"
+#~ msgid "wontfix"
+#~ msgstr "neopravíme"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "nezobrazovať štatistiku v pätke"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "nereprodukovateľná"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "security"
+#~ msgstr "bezpečnosť"
-#~ msgid "Package version:"
-#~ msgstr "Verzia balíka:"
+#~ msgid "patch"
+#~ msgstr "záplata"
-#~ msgid "Distribution:"
-#~ msgstr "Distribúcia:"
+#~ msgid "moreinfo"
+#~ msgstr "viacinfo"
-#~ msgid "bugs"
-#~ msgstr "chyby"
+#~ msgid "l10n"
+#~ msgstr "lokalizácia"
-#~ msgid "open"
-#~ msgstr "otvorené"
+#~ msgid "help"
+#~ msgstr "pomoc"
-#~ msgid "forwarded"
-#~ msgstr "preposlané"
+#~ msgid "fixed-upstream"
+#~ msgstr "opravená-v-upstream"
-#~ msgid "pending"
-#~ msgstr "čaká sa"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "opravená-v-experimental"
-#~ msgid "fixed"
-#~ msgstr "opravené"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "So stavom:"
+#~ msgid "confirmed"
+#~ msgstr "potvrdená"
-#~ msgid "Exclude status:"
-#~ msgstr "Okrem stavu:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "kritická"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "grave"
-#~ msgstr "vážna"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "serious"
-#~ msgstr "významná"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "dôležitá"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "minor"
-#~ msgstr "drobná"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "wishlist"
-#~ msgstr "želanie"
+#~ msgid "Exclude severity:"
+#~ msgstr "Okrem závažnosti:"
#~ msgid "Include severity:"
#~ msgstr "So závažnosťou:"
-#~ msgid "Exclude severity:"
-#~ msgstr "Okrem závažnosti:"
+#~ msgid "wishlist"
+#~ msgstr "želanie"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "drobná"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "dôležitá"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "významná"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "vážna"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "kritická"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Okrem stavu:"
-#~ msgid "confirmed"
-#~ msgstr "potvrdená"
+#~ msgid "Include status:"
+#~ msgstr "So stavom:"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "fixed"
+#~ msgstr "opravené"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "opravená-v-experimental"
+#~ msgid "pending"
+#~ msgstr "čaká sa"
-#~ msgid "fixed-upstream"
-#~ msgstr "opravená-v-upstream"
+#~ msgid "forwarded"
+#~ msgstr "preposlané"
-#~ msgid "help"
-#~ msgstr "pomoc"
+#~ msgid "open"
+#~ msgstr "otvorené"
-#~ msgid "l10n"
-#~ msgstr "lokalizácia"
+#~ msgid "bugs"
+#~ msgstr "chyby"
-#~ msgid "moreinfo"
-#~ msgstr "viacinfo"
+#~ msgid "Distribution:"
+#~ msgstr "Distribúcia:"
-#~ msgid "patch"
-#~ msgstr "záplata"
+#~ msgid "Package version:"
+#~ msgstr "Verzia balíka:"
-#~ msgid "security"
-#~ msgstr "bezpečnosť"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "unreproducible"
-#~ msgstr "nereprodukovateľná"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "nezobrazovať štatistiku v pätke"
-#~ msgid "wontfix"
-#~ msgstr "neopravíme"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "nezobrazovať obsah v hlavičke"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "nezoraovať podľa stavu či závažnosti"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "display merged bugs only once"
+#~ msgstr "zobrazovať zlúčené chyby iba raz"
-#~ msgid "Include tag:"
-#~ msgstr "So značkou:"
+#~ msgid "active bugs"
+#~ msgstr "aktívne chyby"
-#~ msgid "Exclude tag:"
-#~ msgstr "Okrem značky:"
+#~ msgid "Flags:"
+#~ msgstr "Príznaky:"
diff --git a/slovak/po/countries.sk.po b/slovak/po/countries.sk.po
index 7d4d647c664..7216ec51365 100644
--- a/slovak/po/countries.sk.po
+++ b/slovak/po/countries.sk.po
@@ -338,7 +338,6 @@ msgid "Portugal"
msgstr "Portugalsko"
#: ../../english/template/debian/countries.wml:351
-#| msgid "Reunion"
msgid "Réunion"
msgstr "Réunion"
@@ -434,1016 +433,1016 @@ msgstr "Južná Afrika"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
-
-#, fuzzy
-#~ msgid "Islamic Republic of Afghanistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "Great Britain"
+#~ msgstr "Spojené kráľovstvo"
-#~ msgid "Åland Islands"
-#~ msgstr "Ålandy"
+#~ msgid "Kingdom of Nepal"
+#~ msgstr "Nepálske kráľovstvo"
-#~ msgid "Republic of Albania"
-#~ msgstr "Albánska republika"
+#~ msgid "State of Bahrain"
+#~ msgstr "Bahrajnské kráľovstvo"
-#~ msgid "People's Democratic Republic of Algeria"
-#~ msgstr "Alžírska demokratická ľudová republika"
+#~ msgid "The Transitional Islamic State of Afghanistan"
+#~ msgstr "Dočasný afganský islamský štát"
-#~ msgid "American Samoa"
-#~ msgstr "Americká Samoa"
+#, fuzzy
+#~ msgid "Zaire, Republic of"
+#~ msgstr "Kórejská republika"
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#, fuzzy
+#~ msgid "Yugoslavia, Socialist Federal Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
-#~ msgid "Principality of Andorra"
-#~ msgstr "Andorrské kniežatstvo"
+#, fuzzy
+#~ msgid "Yemen, Yemen Arab Republic"
+#~ msgstr "Sýrska arabská republika"
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#, fuzzy
+#~ msgid "Yemen, Democratic, People's Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Republic of Angola"
-#~ msgstr "Angolská republika"
+#, fuzzy
+#~ msgid "Wake Island"
+#~ msgstr "Faerské ostrovy"
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
+#, fuzzy
+#~ msgid "Viet-Nam, Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Antarctica"
-#~ msgstr "Antarktída"
+#, fuzzy
+#~ msgid "Vatican City State (Holy See)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Antigua a Barbuda"
+#, fuzzy
+#~ msgid "Upper Volta, Republic of"
+#~ msgstr "Moldavská republika"
-#~ msgid "Argentine Republic"
-#~ msgstr "Argentínska republika"
+#, fuzzy
+#~ msgid "Serbia and Montenegro"
+#~ msgstr "Čiernohorská republika"
-#~ msgid "Republic of Armenia"
-#~ msgstr "Arménska republika"
+#, fuzzy
+#~ msgid "Romania, Socialist Republic of"
+#~ msgstr "Vietnamská socialistická republika"
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#, fuzzy
+#~ msgid "Panama, Republic of"
+#~ msgstr "Macedónska republika"
-#~ msgid "Republic of Austria"
-#~ msgstr "Rakúska republika"
+#, fuzzy
+#~ msgid "Midway Islands"
+#~ msgstr "Kajmanie ostrovy"
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajdžan"
+#, fuzzy
+#~ msgid "Johnston Island"
+#~ msgstr "Cookove ostrovy"
-#~ msgid "Republic of Azerbaijan"
-#~ msgstr "Azerbajdžanská republika"
+#, fuzzy
+#~ msgid "Gilbert and Ellice Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
-#~ msgid "Commonwealth of the Bahamas"
-#~ msgstr "Bahamské spoločenstvo"
+#, fuzzy
+#~ msgid "Germany, Federal Republic of"
+#~ msgstr "Nemecká spolková republika"
-#~ msgid "Bahrain"
-#~ msgstr "Bahrajn"
+#, fuzzy
+#~ msgid "German Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
#, fuzzy
-#~ msgid "Kingdom of Bahrain"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "French Southern and Antarctic Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
-#~ msgid "People's Republic of Bangladesh"
-#~ msgstr "Bangladéšska ľudová republika"
+#, fuzzy
+#~ msgid "Burma, Socialist Republic of the Union of"
+#~ msgstr "Vietnamská socialistická republika"
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#, fuzzy
+#~ msgid "British Antarctic Territory"
+#~ msgstr "Britské indickooceánske územie"
-#~ msgid "Republic of Belarus"
-#~ msgstr "Bieloruská republika"
+#~ msgid "Republic of Zimbabwe"
+#~ msgstr "Zimbabwianska republika"
-#~ msgid "Kingdom of Belgium"
-#~ msgstr "Belgické kráľovstvo"
+#~ msgid "Republic of Zambia"
+#~ msgstr "Zambijská republika"
-#~ msgid "Belize"
-#~ msgstr "Belize"
+#~ msgid "Zambia"
+#~ msgstr "Zambia"
-#~ msgid "Benin"
-#~ msgstr "Benin"
+#~ msgid "Republic of Yemen"
+#~ msgstr "Jemenská republika"
-#~ msgid "Republic of Benin"
-#~ msgstr "Beninská republika"
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
-#~ msgid "Bermuda"
-#~ msgstr "Bermudy"
+#~ msgid "Western Sahara"
+#~ msgstr "Západná Sahara"
-#~ msgid "Bhutan"
-#~ msgstr "Bhután"
+#~ msgid "Wallis and Futuna"
+#~ msgstr "Wallis a Futuna"
-#~ msgid "Kingdom of Bhutan"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "Virgin Islands of the United States"
+#~ msgstr "Panenské ostrovy Spojených štátov"
-#~ msgid "Bolivia"
-#~ msgstr "Bolívia"
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Panenské ostrovy, Americké"
-#~ msgid "Republic of Bolivia"
-#~ msgstr "Bolívijská republika"
+#~ msgid "British Virgin Islands"
+#~ msgstr "Britské Panenské ostrovy"
-#~ msgid "Republic of Bosnia and Herzegovina"
-#~ msgstr "Republika Bosny a Hercegoviny"
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Panenské ostrovy, Britské"
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#~ msgid "Socialist Republic of Viet Nam"
+#~ msgstr "Vietnamská socialistická republika"
-#~ msgid "Republic of Botswana"
-#~ msgstr "Botswanská republika"
+#~ msgid "Bolivarian Republic of Venezuela"
+#~ msgstr "Venezuelská bolívarovská republika"
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetov ostrov"
+#~ msgid "Republic of Vanuatu"
+#~ msgstr "Vanuatská republika"
-#~ msgid "Federative Republic of Brazil"
-#~ msgstr "Brazílska federatívna republika"
+#~ msgid "Republic of Uzbekistan"
+#~ msgstr "Uzbecká republika"
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britské indickooceánske územie"
+#~ msgid "Eastern Republic of Uruguay"
+#~ msgstr "Uruguajská východná republika"
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunejsko-darussalamský štát"
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Menšie odľahlé ostrovy Spojených štátov"
-#~ msgid "Republic of Bulgaria"
-#~ msgstr "Bulharská republika"
+#~ msgid "United States of America"
+#~ msgstr "Spojené štáty americké"
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
+#~ msgid "United Kingdom of Great Britain and Northern Ireland"
+#~ msgstr "Spojené kráľovstvo Veľkej Británie a Severného Írska"
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#~ msgid "Republic of Uganda"
+#~ msgstr "Ugandská republika"
-#~ msgid "Republic of Burundi"
-#~ msgstr "Burundská republika"
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
-#~ msgid "Cambodia"
-#~ msgstr "Kambodža"
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
-#~ msgid "Kingdom of Cambodia"
-#~ msgstr "Kambodžské kráľovstvo"
+#~ msgid "Turks and Caicos Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkménsko"
-#~ msgid "Republic of Cameroon"
-#~ msgstr "Kamerunská republika"
+#~ msgid "Republic of Turkey"
+#~ msgstr "Turecká republika"
-#~ msgid "Cape Verde"
-#~ msgstr "Kapverdy"
+#~ msgid "Republic of Tunisia"
+#~ msgstr "Tuniská republika"
-#~ msgid "Republic of Cape Verde"
-#~ msgstr "Kapverdská republika"
+#~ msgid "Republic of Trinidad and Tobago"
+#~ msgstr "Republika Trinidadu a Tobaga"
-#~ msgid "Cayman Islands"
-#~ msgstr "Kajmanie ostrovy"
+#~ msgid "Trinidad and Tobago"
+#~ msgstr "Trinidad a Tobago"
-#~ msgid "Central African Republic"
-#~ msgstr "Stredoafrická republika"
+#~ msgid "Kingdom of Tonga"
+#~ msgstr "Tongské kráľovstvo"
-#~ msgid "Chad"
-#~ msgstr "Čad"
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
-#~ msgid "Republic of Chad"
-#~ msgstr "Čadská republika"
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
-#~ msgid "Republic of Chile"
-#~ msgstr "Čilská republika"
+#~ msgid "Togolese Republic"
+#~ msgstr "Togská republika"
-#~ msgid "People's Republic of China"
-#~ msgstr "Čínska ľudová republika"
+#~ msgid "Togo"
+#~ msgstr "Togo"
-#~ msgid "Christmas Island"
-#~ msgstr "Vianočný ostrov"
+#~ msgid "Democratic Republic of Timor-Leste"
+#~ msgstr "Východotimorská demokratická republika"
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosové ostrovy"
+#~ msgid "Timor-Leste"
+#~ msgstr "Východný Timor"
-#~ msgid "Republic of Colombia"
-#~ msgstr "Kolumbijská republika"
+#~ msgid "Kingdom of Thailand"
+#~ msgstr "Thajské kráľovstvo"
-#~ msgid "Comoros"
-#~ msgstr "Komory"
+#~ msgid "United Republic of Tanzania"
+#~ msgstr "Tanzánijská zjednotená republika"
-#~ msgid "Union of the Comoros"
-#~ msgstr "Komorský zväz"
+#~ msgid "Tanzania, United Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid "Republic of Tajikistan"
+#~ msgstr "Tadžická republika"
-#~ msgid "Republic of the Congo"
-#~ msgstr "Konžská republika"
+#~ msgid "Taiwan, Province of China"
+#~ msgstr "Taiwan, provincia Číny"
-#~ msgid "Congo, The Democratic Republic of the"
-#~ msgstr "Konžská demokratická republika"
+#~ msgid "Syrian Arab Republic"
+#~ msgstr "Sýrska arabská republika"
-#~ msgid "Cook Islands"
-#~ msgstr "Cookove ostrovy"
+#~ msgid "Swiss Confederation"
+#~ msgstr "Švajčiarska konfederácia"
-#~ msgid "Republic of Costa Rica"
-#~ msgstr "Kostarická republika"
+#~ msgid "Kingdom of Sweden"
+#~ msgstr "Švédske kráľovstvo"
-#~ msgid "Côte d'Ivoire"
-#~ msgstr "Pobrežie Slonoviny"
+#~ msgid "Kingdom of Swaziland"
+#~ msgstr "Svazijské kráľovstvo"
-#, fuzzy
-#~ msgid "Republic of Côte d'Ivoire"
-#~ msgstr "Republika Pobrežia Slonoviny"
+#~ msgid "Swaziland"
+#~ msgstr "Svazijsko"
-#~ msgid "Republic of Croatia"
-#~ msgstr "Chorvátska republika"
+#~ msgid "Svalbard and Jan Mayen"
+#~ msgstr "Svalbard a Jan Mayen"
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
+#~ msgid "Republic of Suriname"
+#~ msgstr "Surinamská republika"
-#~ msgid "Republic of Cuba"
-#~ msgstr "Kubánska republika"
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
-#~ msgid "Cyprus"
-#~ msgstr "Cyprus"
+#~ msgid "Republic of the Sudan"
+#~ msgstr "Sudánska republika"
-#~ msgid "Republic of Cyprus"
-#~ msgstr "Cyperská republika"
+#~ msgid "Sudan"
+#~ msgstr "Sudán"
-#~ msgid "Kingdom of Denmark"
-#~ msgstr "Dánske kráľovstvo"
+#~ msgid "Democratic Socialist Republic of Sri Lanka"
+#~ msgstr "Srílanská demokratická socialistická republika"
-#~ msgid "Djibouti"
-#~ msgstr "Džibutsko"
+#~ msgid "Kingdom of Spain"
+#~ msgstr "Španielske kráľovstvo"
-#~ msgid "Republic of Djibouti"
-#~ msgstr "Džibutská republika"
+#~ msgid "South Georgia and the South Sandwich Islands"
+#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
+#~ msgid "Republic of South Africa"
+#~ msgstr "Juhoafrická republika"
-#~ msgid "Commonwealth of Dominica"
-#~ msgstr "Dominické spoločenstvo"
+#~ msgid "Somali Republic"
+#~ msgstr "Somálska republika"
-#~ msgid "Republic of Ecuador"
-#~ msgstr "Ekvádorská republika"
+#~ msgid "Somalia"
+#~ msgstr "Somálsko"
-#~ msgid "Arab Republic of Egypt"
-#~ msgstr "Egyptská arabská republika"
+#~ msgid "Solomon Islands"
+#~ msgstr "Šalamúnove ostrovy"
-#~ msgid "Republic of El Salvador"
-#~ msgstr "Salvádorská republika"
+#~ msgid "Republic of Slovenia"
+#~ msgstr "Slovinská republika"
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Rovníková Guinea"
+#~ msgid "Slovak Republic"
+#~ msgstr "Slovenská republika"
-#~ msgid "Republic of Equatorial Guinea"
-#~ msgstr "Republika Rovníkovej Guiney"
+#~ msgid "Republic of Singapore"
+#~ msgstr "Singapurská republika"
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#~ msgid "Republic of Sierra Leone"
+#~ msgstr "Sierraleonská republika"
-#~ msgid "Republic of Estonia"
-#~ msgstr "Estónska republika"
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
-#~ msgid "Federal Democratic Republic of Ethiopia"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Republic of Seychelles"
+#~ msgstr "Seychelská republika"
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandy (Malvíny)"
+#~ msgid "Seychelles"
+#~ msgstr "Seychely"
-#~ msgid "Fiji"
-#~ msgstr "Fidži"
+#~ msgid "Republic of Serbia"
+#~ msgstr "Srbská republika"
-#~ msgid "Republic of the Fiji Islands"
-#~ msgstr "Republika Fidžijských ostrovov"
+#~ msgid "Republic of Senegal"
+#~ msgstr "Senegalská republika"
-#~ msgid "Republic of Finland"
-#~ msgstr "Fínska republika"
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
-#~ msgid "French Republic"
-#~ msgstr "Francúzska republika"
+#~ msgid "Kingdom of Saudi Arabia"
+#~ msgstr "Saudskoarabské kráľovstvo"
-#~ msgid "French Guiana"
-#~ msgstr "Francúzska Guyana"
+#~ msgid "Democratic Republic of Sao Tome and Principe"
+#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
-#~ msgid "French Southern Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
+#~ msgid "Sao Tome and Principe"
+#~ msgstr "Svätý Tomáš a Princov ostrov"
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid "Republic of San Marino"
+#~ msgstr "Sanmarínska republika"
-#~ msgid "Gabonese Republic"
-#~ msgstr "Gabonská republika"
+#~ msgid "San Marino"
+#~ msgstr "San Maríno"
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
+#~ msgid "Independent State of Samoa"
+#~ msgstr "Samojský nezávislý štát"
-#~ msgid "Republic of the Gambia"
-#~ msgstr "Gambijská republika"
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
-#~ msgid "Federal Republic of Germany"
-#~ msgstr "Nemecká spolková republika"
+#~ msgid "Saint Vincent and the Grenadines"
+#~ msgstr "Svätý Vincent a Grenadíny"
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#~ msgid "Saint Pierre and Miquelon"
+#~ msgstr "Saint Pierre a Miquelon"
-#~ msgid "Republic of Ghana"
-#~ msgstr "Ghanská republika"
+#~ msgid "Saint Lucia"
+#~ msgstr "Svätá Lucia"
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltár"
+#~ msgid "Saint Kitts and Nevis"
+#~ msgstr "Svätý Krištof a Nevis"
-# pozn.: Na výslovnú žiadosť gréckej strany sa v medzinárodných dohodách, zmluvách a podobných dokumentoch medzi Gréckou republikou a Slovenskou republikou používa podoba Helénska republika, v ostatných prípadoch podoba Grécka republika.
-#~ msgid "Hellenic Republic"
-#~ msgstr "Grécka republika"
+#~ msgid "Saint Helena"
+#~ msgstr "Svätá Helena"
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
+#~ msgid "Rwandese Republic"
+#~ msgstr "Rwandská republika"
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#~ msgid "Rwanda"
+#~ msgstr "Rwanda"
-#~ msgid "Republic of Guatemala"
-#~ msgstr "Guatemalská republika"
+#~ msgid "Russian Federation"
+#~ msgstr "Ruská federácia"
-#~ msgid "Guernsey"
-#~ msgstr "Guernsey"
+#~ msgid "State of Qatar"
+#~ msgstr "Katarský štát"
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
+#~ msgid "Qatar"
+#~ msgstr "Katar"
-#~ msgid "Republic of Guinea"
-#~ msgstr "Guinejská republika"
+#~ msgid "Puerto Rico"
+#~ msgstr "Portoriko"
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
+#~ msgid "Portuguese Republic"
+#~ msgstr "Portugalská republika"
-#~ msgid "Republic of Guinea-Bissau"
-#~ msgstr "Guinejsko-bissauská republika"
+#~ msgid "Republic of Poland"
+#~ msgstr "Poľská republika"
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairnove ostrovy"
-#~ msgid "Republic of Guyana"
-#~ msgstr "Guyanská kooperatívna republika"
+#~ msgid "Republic of the Philippines"
+#~ msgstr "Filipínska republika"
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
+#~ msgid "Republic of Peru"
+#~ msgstr "Peruánska republika"
-#~ msgid "Republic of Haiti"
-#~ msgstr "Haitská republika"
+#~ msgid "Republic of Paraguay"
+#~ msgstr "Paraguajská republika"
-#~ msgid "Heard Island and McDonald Islands"
-#~ msgstr "Heardov ostrov"
+#~ msgid "Paraguay"
+#~ msgstr "Paraguaj"
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua - Nová Guinea"
-#~ msgid "Republic of Honduras"
-#~ msgstr "Honduraská republika"
+#~ msgid "Republic of Panama"
+#~ msgstr "Panamská republika"
-#~ msgid "Hong Kong Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
+#~ msgid "Occupied Palestinian Territory"
+#~ msgstr "Okupované palestínske územie"
-#~ msgid "Republic of Hungary"
-#~ msgstr "Maďarská republika"
+#~ msgid "Palestinian Territory, Occupied"
+#~ msgstr "palestínske územie, Okupované"
-#~ msgid "Republic of Iceland"
-#~ msgstr "Islandská republika"
+#~ msgid "Republic of Palau"
+#~ msgstr "Palauská republika"
-#~ msgid "Republic of India"
-#~ msgstr "Indická republika"
+#~ msgid "Palau"
+#~ msgstr "Palau"
-#~ msgid "Republic of Indonesia"
-#~ msgstr "Indonézska republika"
+#~ msgid "Islamic Republic of Pakistan"
+#~ msgstr "Pakistanská islamská republika"
-#~ msgid "Iran, Islamic Republic of"
-#~ msgstr "Iránska islamská republika"
+#~ msgid "Sultanate of Oman"
+#~ msgstr "Ománsky sultanát"
-#~ msgid "Islamic Republic of Iran"
-#~ msgstr "Iránska islamská republika"
+#~ msgid "Oman"
+#~ msgstr "Omán"
-#~ msgid "Republic of Iraq"
-#~ msgstr "Iracká republika"
+#~ msgid "Kingdom of Norway"
+#~ msgstr "Nórske kráľovstvo"
-#~ msgid "Isle of Man"
-#~ msgstr "Man"
+#~ msgid "Commonwealth of the Northern Mariana Islands"
+#~ msgstr "Spoločenstvo Severných Marián"
-#~ msgid "State of Israel"
-#~ msgstr "Izraelský štát"
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Severné Mariány"
-#~ msgid "Italian Republic"
-#~ msgstr "Talianska republika"
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolk"
-#~ msgid "Jamaica"
-#~ msgstr "Jamajka"
+#~ msgid "Republic of Niue"
+#~ msgstr "Republika Niue"
-#~ msgid "Jersey"
-#~ msgstr "Jersey"
+#~ msgid "Niue"
+#~ msgstr "Niue"
-#~ msgid "Hashemite Kingdom of Jordan"
-#~ msgstr "Jordánske hášimovské kráľovstvo"
+#~ msgid "Federal Republic of Nigeria"
+#~ msgstr "Nigérijská federatívna republika"
-#~ msgid "Republic of Kazakhstan"
-#~ msgstr "Kazašská republika"
+#~ msgid "Nigeria"
+#~ msgstr "Nigéria"
-#~ msgid "Republic of Kenya"
-#~ msgstr "Kenská republika"
+#~ msgid "Republic of the Niger"
+#~ msgstr "Nigerská republika"
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#~ msgid "Niger"
+#~ msgstr "Niger"
-#~ msgid "Republic of Kiribati"
-#~ msgstr "Kiribatská republika"
+#~ msgid "Republic of Nicaragua"
+#~ msgstr "Nikaragujská republika"
-#~ msgid "Korea, Democratic People's Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Holandské Antily"
-#~ msgid "Democratic People's Republic of Korea"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Kingdom of the Netherlands"
+#~ msgstr "Holandské kráľovstvo"
-#~ msgid "Korea, Republic of"
-#~ msgstr "Kórejská republika"
+#, fuzzy
+#~ msgid "Federal Democratic Republic of Nepal"
+#~ msgstr "Etiópska federatívna demokratická republika"
-#~ msgid "State of Kuwait"
-#~ msgstr "Kuvajtský štát"
+#~ msgid "Nepal"
+#~ msgstr "Nepál"
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizsko"
+#~ msgid "Republic of Nauru"
+#~ msgstr "Nauruská republika"
-#~ msgid "Kyrgyz Republic"
-#~ msgstr "Kirgizská republika"
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
-#~ msgid "Lao People's Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
+#~ msgid "Republic of Namibia"
+#~ msgstr "Namíbijská republika"
-#~ msgid "Republic of Latvia"
-#~ msgstr "Lotyšská republika"
+#~ msgid "Namibia"
+#~ msgstr "Namíbia"
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
+#~ msgid "Union of Myanmar"
+#~ msgstr "Mjanmarský zväz"
-#~ msgid "Lebanese Republic"
-#~ msgstr "Libanonská republika"
+#~ msgid "Myanmar"
+#~ msgstr "Mjanmarsko"
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
+#~ msgid "Republic of Mozambique"
+#~ msgstr "Mozambická republika"
-#~ msgid "Kingdom of Lesotho"
-#~ msgstr "Lesothské kráľovstvo"
+#~ msgid "Mozambique"
+#~ msgstr "Mozambik"
-#~ msgid "Liberia"
-#~ msgstr "Libéria"
+#~ msgid "Kingdom of Morocco"
+#~ msgstr "Marocké kráľovstvo"
-#~ msgid "Republic of Liberia"
-#~ msgstr "Libérijská republika"
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Líbya"
+#~ msgid "Principality of Monaco"
+#~ msgstr "Monacké kniežatstvo"
-#~ msgid "Socialist People's Libyan Arab Jamahiriya"
-#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
+#~ msgid "Monaco"
+#~ msgstr "Monako"
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichtenštajnsko"
+#~ msgid "Republic of Moldova"
+#~ msgstr "Moldavská republika"
-#~ msgid "Principality of Liechtenstein"
-#~ msgstr "Lichtenštajnské kniežatstvo"
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Mikronézske federatívne štáty"
-#~ msgid "Republic of Lithuania"
-#~ msgstr "Litovská republika"
+#~ msgid "Micronesia, Federated States of"
+#~ msgstr "Mikronézske federatívne štáty"
-#~ msgid "Grand Duchy of Luxembourg"
-#~ msgstr "Luxemburské veľkovojvodstvo"
+#~ msgid "United Mexican States"
+#~ msgstr "Spojené štáty mexické"
-#~ msgid "Macao"
-#~ msgstr "Macao"
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
-#~ msgid "Macao Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Macao"
+#~ msgid "Republic of Mauritius"
+#~ msgstr "Maurícijská republika"
-#~ msgid "The Former Yugoslav Republic of Macedonia"
-#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
+#~ msgid "Mauritius"
+#~ msgstr "Maurícius"
-#~ msgid "Republic of Madagascar"
-#~ msgstr "Madagaskarská republika"
+#~ msgid "Islamic Republic of Mauritania"
+#~ msgstr "Mauritánska islamská republika"
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
+#~ msgid "Mauritania"
+#~ msgstr "Mauritánia"
-#~ msgid "Republic of Malawi"
-#~ msgstr "Malawijská republika"
+#~ msgid "Martinique"
+#~ msgstr "Martinik"
-#~ msgid "Maldives"
-#~ msgstr "Maldivy"
+#~ msgid "Republic of the Marshall Islands"
+#~ msgstr "Republika Marshallových ostrovov"
-#~ msgid "Republic of Maldives"
-#~ msgstr "Maldivská republika"
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshallove ostrovy"
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#~ msgid "Republic of Malta"
+#~ msgstr "Maltská republika"
#~ msgid "Republic of Mali"
#~ msgstr "Malijská republika"
-#~ msgid "Republic of Malta"
-#~ msgstr "Maltská republika"
+#~ msgid "Mali"
+#~ msgstr "Mali"
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallove ostrovy"
+#~ msgid "Republic of Maldives"
+#~ msgstr "Maldivská republika"
-#~ msgid "Republic of the Marshall Islands"
-#~ msgstr "Republika Marshallových ostrovov"
+#~ msgid "Maldives"
+#~ msgstr "Maldivy"
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
+#~ msgid "Republic of Malawi"
+#~ msgstr "Malawijská republika"
-#~ msgid "Mauritania"
-#~ msgstr "Mauritánia"
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
-#~ msgid "Islamic Republic of Mauritania"
-#~ msgstr "Mauritánska islamská republika"
+#~ msgid "Republic of Madagascar"
+#~ msgstr "Madagaskarská republika"
-#~ msgid "Mauritius"
-#~ msgstr "Maurícius"
+#~ msgid "The Former Yugoslav Republic of Macedonia"
+#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
-#~ msgid "Republic of Mauritius"
-#~ msgstr "Maurícijská republika"
+#~ msgid "Macao Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Macao"
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
+#~ msgid "Macao"
+#~ msgstr "Macao"
-#~ msgid "United Mexican States"
-#~ msgstr "Spojené štáty mexické"
+#~ msgid "Grand Duchy of Luxembourg"
+#~ msgstr "Luxemburské veľkovojvodstvo"
-#~ msgid "Micronesia, Federated States of"
-#~ msgstr "Mikronézske federatívne štáty"
+#~ msgid "Republic of Lithuania"
+#~ msgstr "Litovská republika"
-#~ msgid "Federated States of Micronesia"
-#~ msgstr "Mikronézske federatívne štáty"
+#~ msgid "Principality of Liechtenstein"
+#~ msgstr "Lichtenštajnské kniežatstvo"
-#~ msgid "Republic of Moldova"
-#~ msgstr "Moldavská republika"
+#~ msgid "Liechtenstein"
+#~ msgstr "Lichtenštajnsko"
-#~ msgid "Monaco"
-#~ msgstr "Monako"
+#~ msgid "Socialist People's Libyan Arab Jamahiriya"
+#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
-#~ msgid "Principality of Monaco"
-#~ msgstr "Monacké kniežatstvo"
+#~ msgid "Libyan Arab Jamahiriya"
+#~ msgstr "Líbya"
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#~ msgid "Republic of Liberia"
+#~ msgstr "Libérijská republika"
-#~ msgid "Kingdom of Morocco"
-#~ msgstr "Marocké kráľovstvo"
+#~ msgid "Liberia"
+#~ msgstr "Libéria"
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
+#~ msgid "Kingdom of Lesotho"
+#~ msgstr "Lesothské kráľovstvo"
-#~ msgid "Republic of Mozambique"
-#~ msgstr "Mozambická republika"
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
-#~ msgid "Myanmar"
-#~ msgstr "Mjanmarsko"
+#~ msgid "Lebanese Republic"
+#~ msgstr "Libanonská republika"
-#~ msgid "Union of Myanmar"
-#~ msgstr "Mjanmarský zväz"
+#~ msgid "Lebanon"
+#~ msgstr "Libanon"
-#~ msgid "Namibia"
-#~ msgstr "Namíbia"
+#~ msgid "Republic of Latvia"
+#~ msgstr "Lotyšská republika"
-#~ msgid "Republic of Namibia"
-#~ msgstr "Namíbijská republika"
+#~ msgid "Lao People's Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#~ msgid "Kyrgyz Republic"
+#~ msgstr "Kirgizská republika"
-#~ msgid "Republic of Nauru"
-#~ msgstr "Nauruská republika"
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kirgizsko"
-#~ msgid "Nepal"
-#~ msgstr "Nepál"
+#~ msgid "State of Kuwait"
+#~ msgstr "Kuvajtský štát"
-#, fuzzy
-#~ msgid "Federal Democratic Republic of Nepal"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Korea, Republic of"
+#~ msgstr "Kórejská republika"
-#~ msgid "Kingdom of the Netherlands"
-#~ msgstr "Holandské kráľovstvo"
+#~ msgid "Democratic People's Republic of Korea"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Holandské Antily"
+#~ msgid "Korea, Democratic People's Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Republic of Nicaragua"
-#~ msgstr "Nikaragujská republika"
+#~ msgid "Republic of Kiribati"
+#~ msgstr "Kiribatská republika"
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
-#~ msgid "Republic of the Niger"
-#~ msgstr "Nigerská republika"
+#~ msgid "Republic of Kenya"
+#~ msgstr "Kenská republika"
-#~ msgid "Nigeria"
-#~ msgstr "Nigéria"
+#~ msgid "Republic of Kazakhstan"
+#~ msgstr "Kazašská republika"
-#~ msgid "Federal Republic of Nigeria"
-#~ msgstr "Nigérijská federatívna republika"
+#~ msgid "Hashemite Kingdom of Jordan"
+#~ msgstr "Jordánske hášimovské kráľovstvo"
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
-#~ msgid "Republic of Niue"
-#~ msgstr "Republika Niue"
+#~ msgid "Jamaica"
+#~ msgstr "Jamajka"
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk"
+#~ msgid "Italian Republic"
+#~ msgstr "Talianska republika"
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severné Mariány"
+#~ msgid "State of Israel"
+#~ msgstr "Izraelský štát"
-#~ msgid "Commonwealth of the Northern Mariana Islands"
-#~ msgstr "Spoločenstvo Severných Marián"
+#~ msgid "Isle of Man"
+#~ msgstr "Man"
-#~ msgid "Kingdom of Norway"
-#~ msgstr "Nórske kráľovstvo"
+#~ msgid "Republic of Iraq"
+#~ msgstr "Iracká republika"
-#~ msgid "Oman"
-#~ msgstr "Omán"
+#~ msgid "Islamic Republic of Iran"
+#~ msgstr "Iránska islamská republika"
-#~ msgid "Sultanate of Oman"
-#~ msgstr "Ománsky sultanát"
+#~ msgid "Iran, Islamic Republic of"
+#~ msgstr "Iránska islamská republika"
-#~ msgid "Islamic Republic of Pakistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "Republic of Indonesia"
+#~ msgstr "Indonézska republika"
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#~ msgid "Republic of India"
+#~ msgstr "Indická republika"
-#~ msgid "Republic of Palau"
-#~ msgstr "Palauská republika"
+#~ msgid "Republic of Iceland"
+#~ msgstr "Islandská republika"
-#~ msgid "Palestinian Territory, Occupied"
-#~ msgstr "palestínske územie, Okupované"
+#~ msgid "Republic of Hungary"
+#~ msgstr "Maďarská republika"
-#~ msgid "Occupied Palestinian Territory"
-#~ msgstr "Okupované palestínske územie"
+#~ msgid "Hong Kong Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
-#~ msgid "Republic of Panama"
-#~ msgstr "Panamská republika"
+#~ msgid "Republic of Honduras"
+#~ msgstr "Honduraská republika"
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua - Nová Guinea"
+#~ msgid "Holy See (Vatican City State)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
-#~ msgid "Paraguay"
-#~ msgstr "Paraguaj"
+#~ msgid "Heard Island and McDonald Islands"
+#~ msgstr "Heardov ostrov"
-#~ msgid "Republic of Paraguay"
-#~ msgstr "Paraguajská republika"
+#~ msgid "Republic of Haiti"
+#~ msgstr "Haitská republika"
-#~ msgid "Republic of Peru"
-#~ msgstr "Peruánska republika"
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
-#~ msgid "Republic of the Philippines"
-#~ msgstr "Filipínska republika"
+#~ msgid "Republic of Guyana"
+#~ msgstr "Guyanská kooperatívna republika"
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairnove ostrovy"
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
-#~ msgid "Republic of Poland"
-#~ msgstr "Poľská republika"
+#~ msgid "Republic of Guinea-Bissau"
+#~ msgstr "Guinejsko-bissauská republika"
-#~ msgid "Portuguese Republic"
-#~ msgstr "Portugalská republika"
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Guinea-Bissau"
-#~ msgid "Puerto Rico"
-#~ msgstr "Portoriko"
+#~ msgid "Republic of Guinea"
+#~ msgstr "Guinejská republika"
-#~ msgid "Qatar"
-#~ msgstr "Katar"
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
-#~ msgid "State of Qatar"
-#~ msgstr "Katarský štát"
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
-#~ msgid "Russian Federation"
-#~ msgstr "Ruská federácia"
+#~ msgid "Republic of Guatemala"
+#~ msgstr "Guatemalská republika"
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
+#~ msgid "Guam"
+#~ msgstr "Guam"
-#~ msgid "Rwandese Republic"
-#~ msgstr "Rwandská republika"
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
-#~ msgid "Saint Helena"
-#~ msgstr "Svätá Helena"
+# pozn.: Na výslovnú žiadosť gréckej strany sa v medzinárodných dohodách, zmluvách a podobných dokumentoch medzi Gréckou republikou a Slovenskou republikou používa podoba Helénska republika, v ostatných prípadoch podoba Grécka republika.
+#~ msgid "Hellenic Republic"
+#~ msgstr "Grécka republika"
-#~ msgid "Saint Kitts and Nevis"
-#~ msgstr "Svätý Krištof a Nevis"
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltár"
-#~ msgid "Saint Lucia"
-#~ msgstr "Svätá Lucia"
+#~ msgid "Republic of Ghana"
+#~ msgstr "Ghanská republika"
-#~ msgid "Saint Pierre and Miquelon"
-#~ msgstr "Saint Pierre a Miquelon"
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
-#~ msgid "Saint Vincent and the Grenadines"
-#~ msgstr "Svätý Vincent a Grenadíny"
+#~ msgid "Federal Republic of Germany"
+#~ msgstr "Nemecká spolková republika"
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#~ msgid "Republic of the Gambia"
+#~ msgstr "Gambijská republika"
-#~ msgid "Independent State of Samoa"
-#~ msgstr "Samojský nezávislý štát"
+#~ msgid "Gambia"
+#~ msgstr "Gambia"
-#~ msgid "San Marino"
-#~ msgstr "San Maríno"
+#~ msgid "Gabonese Republic"
+#~ msgstr "Gabonská republika"
-#~ msgid "Republic of San Marino"
-#~ msgstr "Sanmarínska republika"
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
-#~ msgid "Sao Tome and Principe"
-#~ msgstr "Svätý Tomáš a Princov ostrov"
+#~ msgid "French Southern Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
-#~ msgid "Democratic Republic of Sao Tome and Principe"
-#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
+#~ msgid "French Guiana"
+#~ msgstr "Francúzska Guyana"
-#~ msgid "Kingdom of Saudi Arabia"
-#~ msgstr "Saudskoarabské kráľovstvo"
+#~ msgid "French Republic"
+#~ msgstr "Francúzska republika"
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#~ msgid "Republic of Finland"
+#~ msgstr "Fínska republika"
-#~ msgid "Republic of Senegal"
-#~ msgstr "Senegalská republika"
+#~ msgid "Republic of the Fiji Islands"
+#~ msgstr "Republika Fidžijských ostrovov"
-#~ msgid "Republic of Serbia"
-#~ msgstr "Srbská republika"
+#~ msgid "Fiji"
+#~ msgstr "Fidži"
-#~ msgid "Seychelles"
-#~ msgstr "Seychely"
+#~ msgid "Falkland Islands (Malvinas)"
+#~ msgstr "Falklandy (Malvíny)"
-#~ msgid "Republic of Seychelles"
-#~ msgstr "Seychelská republika"
+#~ msgid "Federal Democratic Republic of Ethiopia"
+#~ msgstr "Etiópska federatívna demokratická republika"
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#~ msgid "Republic of Estonia"
+#~ msgstr "Estónska republika"
-#~ msgid "Republic of Sierra Leone"
-#~ msgstr "Sierraleonská republika"
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
-#~ msgid "Republic of Singapore"
-#~ msgstr "Singapurská republika"
+#~ msgid "Republic of Equatorial Guinea"
+#~ msgstr "Republika Rovníkovej Guiney"
-#~ msgid "Slovak Republic"
-#~ msgstr "Slovenská republika"
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Rovníková Guinea"
-#~ msgid "Republic of Slovenia"
-#~ msgstr "Slovinská republika"
+#~ msgid "Republic of El Salvador"
+#~ msgstr "Salvádorská republika"
-#~ msgid "Solomon Islands"
-#~ msgstr "Šalamúnove ostrovy"
+#~ msgid "Arab Republic of Egypt"
+#~ msgstr "Egyptská arabská republika"
-#~ msgid "Somalia"
-#~ msgstr "Somálsko"
+#~ msgid "Republic of Ecuador"
+#~ msgstr "Ekvádorská republika"
-#~ msgid "Somali Republic"
-#~ msgstr "Somálska republika"
+#~ msgid "Commonwealth of Dominica"
+#~ msgstr "Dominické spoločenstvo"
-#~ msgid "Republic of South Africa"
-#~ msgstr "Juhoafrická republika"
+#~ msgid "Dominica"
+#~ msgstr "Dominika"
-#~ msgid "South Georgia and the South Sandwich Islands"
-#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
+#~ msgid "Republic of Djibouti"
+#~ msgstr "Džibutská republika"
-#~ msgid "Kingdom of Spain"
-#~ msgstr "Španielske kráľovstvo"
+#~ msgid "Djibouti"
+#~ msgstr "Džibutsko"
-#~ msgid "Democratic Socialist Republic of Sri Lanka"
-#~ msgstr "Srílanská demokratická socialistická republika"
+#~ msgid "Kingdom of Denmark"
+#~ msgstr "Dánske kráľovstvo"
-#~ msgid "Sudan"
-#~ msgstr "Sudán"
+#~ msgid "Republic of Cyprus"
+#~ msgstr "Cyperská republika"
-#~ msgid "Republic of the Sudan"
-#~ msgstr "Sudánska republika"
+#~ msgid "Cyprus"
+#~ msgstr "Cyprus"
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
+#~ msgid "Republic of Cuba"
+#~ msgstr "Kubánska republika"
-#~ msgid "Republic of Suriname"
-#~ msgstr "Surinamská republika"
+#~ msgid "Cuba"
+#~ msgstr "Kuba"
-#~ msgid "Svalbard and Jan Mayen"
-#~ msgstr "Svalbard a Jan Mayen"
+#~ msgid "Republic of Croatia"
+#~ msgstr "Chorvátska republika"
-#~ msgid "Swaziland"
-#~ msgstr "Svazijsko"
+#, fuzzy
+#~ msgid "Republic of Côte d'Ivoire"
+#~ msgstr "Republika Pobrežia Slonoviny"
-#~ msgid "Kingdom of Swaziland"
-#~ msgstr "Svazijské kráľovstvo"
+#~ msgid "Côte d'Ivoire"
+#~ msgstr "Pobrežie Slonoviny"
-#~ msgid "Kingdom of Sweden"
-#~ msgstr "Švédske kráľovstvo"
+#~ msgid "Republic of Costa Rica"
+#~ msgstr "Kostarická republika"
-#~ msgid "Swiss Confederation"
-#~ msgstr "Švajčiarska konfederácia"
+#~ msgid "Cook Islands"
+#~ msgstr "Cookove ostrovy"
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Sýrska arabská republika"
+#~ msgid "Congo, The Democratic Republic of the"
+#~ msgstr "Konžská demokratická republika"
-#~ msgid "Taiwan, Province of China"
-#~ msgstr "Taiwan, provincia Číny"
+#~ msgid "Republic of the Congo"
+#~ msgstr "Konžská republika"
-#~ msgid "Republic of Tajikistan"
-#~ msgstr "Tadžická republika"
+#~ msgid "Congo"
+#~ msgstr "Kongo"
-#~ msgid "Tanzania, United Republic of"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Union of the Comoros"
+#~ msgstr "Komorský zväz"
-#~ msgid "United Republic of Tanzania"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Comoros"
+#~ msgstr "Komory"
-#~ msgid "Kingdom of Thailand"
-#~ msgstr "Thajské kráľovstvo"
+#~ msgid "Republic of Colombia"
+#~ msgstr "Kolumbijská republika"
-#~ msgid "Timor-Leste"
-#~ msgstr "Východný Timor"
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Kokosové ostrovy"
-#~ msgid "Democratic Republic of Timor-Leste"
-#~ msgstr "Východotimorská demokratická republika"
+#~ msgid "Christmas Island"
+#~ msgstr "Vianočný ostrov"
-#~ msgid "Togo"
-#~ msgstr "Togo"
+#~ msgid "People's Republic of China"
+#~ msgstr "Čínska ľudová republika"
-#~ msgid "Togolese Republic"
-#~ msgstr "Togská republika"
+#~ msgid "Republic of Chile"
+#~ msgstr "Čilská republika"
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
+#~ msgid "Republic of Chad"
+#~ msgstr "Čadská republika"
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
+#~ msgid "Chad"
+#~ msgstr "Čad"
-#~ msgid "Kingdom of Tonga"
-#~ msgstr "Tongské kráľovstvo"
+#~ msgid "Central African Republic"
+#~ msgstr "Stredoafrická republika"
-#~ msgid "Trinidad and Tobago"
-#~ msgstr "Trinidad a Tobago"
+#~ msgid "Cayman Islands"
+#~ msgstr "Kajmanie ostrovy"
-#~ msgid "Republic of Trinidad and Tobago"
-#~ msgstr "Republika Trinidadu a Tobaga"
+#~ msgid "Republic of Cape Verde"
+#~ msgstr "Kapverdská republika"
-#~ msgid "Republic of Tunisia"
-#~ msgstr "Tuniská republika"
+#~ msgid "Cape Verde"
+#~ msgstr "Kapverdy"
-#~ msgid "Republic of Turkey"
-#~ msgstr "Turecká republika"
+#~ msgid "Republic of Cameroon"
+#~ msgstr "Kamerunská republika"
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkménsko"
+#~ msgid "Cameroon"
+#~ msgstr "Kamerun"
-#~ msgid "Turks and Caicos Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
+#~ msgid "Kingdom of Cambodia"
+#~ msgstr "Kambodžské kráľovstvo"
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
+#~ msgid "Cambodia"
+#~ msgstr "Kambodža"
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
+#~ msgid "Republic of Burundi"
+#~ msgstr "Burundská republika"
-#~ msgid "Republic of Uganda"
-#~ msgstr "Ugandská republika"
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
-#~ msgid "United Kingdom of Great Britain and Northern Ireland"
-#~ msgstr "Spojené kráľovstvo Veľkej Británie a Severného Írska"
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
-#~ msgid "United States of America"
-#~ msgstr "Spojené štáty americké"
+#~ msgid "Republic of Bulgaria"
+#~ msgstr "Bulharská republika"
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Menšie odľahlé ostrovy Spojených štátov"
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunejsko-darussalamský štát"
-#~ msgid "Eastern Republic of Uruguay"
-#~ msgstr "Uruguajská východná republika"
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Britské indickooceánske územie"
-#~ msgid "Republic of Uzbekistan"
-#~ msgstr "Uzbecká republika"
+#~ msgid "Federative Republic of Brazil"
+#~ msgstr "Brazílska federatívna republika"
-#~ msgid "Republic of Vanuatu"
-#~ msgstr "Vanuatská republika"
+#~ msgid "Bouvet Island"
+#~ msgstr "Bouvetov ostrov"
-#~ msgid "Bolivarian Republic of Venezuela"
-#~ msgstr "Venezuelská bolívarovská republika"
+#~ msgid "Republic of Botswana"
+#~ msgstr "Botswanská republika"
-#~ msgid "Socialist Republic of Viet Nam"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Panenské ostrovy, Britské"
+#~ msgid "Republic of Bosnia and Herzegovina"
+#~ msgstr "Republika Bosny a Hercegoviny"
-#~ msgid "British Virgin Islands"
-#~ msgstr "Britské Panenské ostrovy"
+#~ msgid "Republic of Bolivia"
+#~ msgstr "Bolívijská republika"
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Panenské ostrovy, Americké"
+#~ msgid "Bolivia"
+#~ msgstr "Bolívia"
-#~ msgid "Virgin Islands of the United States"
-#~ msgstr "Panenské ostrovy Spojených štátov"
+#~ msgid "Kingdom of Bhutan"
+#~ msgstr "Bhutánske kráľovstvo"
-#~ msgid "Wallis and Futuna"
-#~ msgstr "Wallis a Futuna"
+#~ msgid "Bhutan"
+#~ msgstr "Bhután"
-#~ msgid "Western Sahara"
-#~ msgstr "Západná Sahara"
+#~ msgid "Bermuda"
+#~ msgstr "Bermudy"
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
+#~ msgid "Republic of Benin"
+#~ msgstr "Beninská republika"
-#~ msgid "Republic of Yemen"
-#~ msgstr "Jemenská republika"
+#~ msgid "Benin"
+#~ msgstr "Benin"
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
+#~ msgid "Belize"
+#~ msgstr "Belize"
-#~ msgid "Republic of Zambia"
-#~ msgstr "Zambijská republika"
+#~ msgid "Kingdom of Belgium"
+#~ msgstr "Belgické kráľovstvo"
-#~ msgid "Republic of Zimbabwe"
-#~ msgstr "Zimbabwianska republika"
+#~ msgid "Republic of Belarus"
+#~ msgstr "Bieloruská republika"
-#, fuzzy
-#~ msgid "British Antarctic Territory"
-#~ msgstr "Britské indickooceánske územie"
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
-#, fuzzy
-#~ msgid "Burma, Socialist Republic of the Union of"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "People's Republic of Bangladesh"
+#~ msgstr "Bangladéšska ľudová republika"
#, fuzzy
-#~ msgid "French Southern and Antarctic Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
+#~ msgid "Kingdom of Bahrain"
+#~ msgstr "Bhutánske kráľovstvo"
-#, fuzzy
-#~ msgid "German Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
+#~ msgid "Bahrain"
+#~ msgstr "Bahrajn"
-#, fuzzy
-#~ msgid "Germany, Federal Republic of"
-#~ msgstr "Nemecká spolková republika"
+#~ msgid "Commonwealth of the Bahamas"
+#~ msgstr "Bahamské spoločenstvo"
-#, fuzzy
-#~ msgid "Gilbert and Ellice Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
+#~ msgid "Republic of Azerbaijan"
+#~ msgstr "Azerbajdžanská republika"
-#, fuzzy
-#~ msgid "Johnston Island"
-#~ msgstr "Cookove ostrovy"
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbajdžan"
-#, fuzzy
-#~ msgid "Midway Islands"
-#~ msgstr "Kajmanie ostrovy"
+#~ msgid "Republic of Austria"
+#~ msgstr "Rakúska republika"
-#, fuzzy
-#~ msgid "Panama, Republic of"
-#~ msgstr "Macedónska republika"
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
-#, fuzzy
-#~ msgid "Romania, Socialist Republic of"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Republic of Armenia"
+#~ msgstr "Arménska republika"
-#, fuzzy
-#~ msgid "Serbia and Montenegro"
-#~ msgstr "Čiernohorská republika"
+#~ msgid "Argentine Republic"
+#~ msgstr "Argentínska republika"
-#, fuzzy
-#~ msgid "Upper Volta, Republic of"
-#~ msgstr "Moldavská republika"
+#~ msgid "Antigua and Barbuda"
+#~ msgstr "Antigua a Barbuda"
-#, fuzzy
-#~ msgid "Vatican City State (Holy See)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
+#~ msgid "Antarctica"
+#~ msgstr "Antarktída"
-#, fuzzy
-#~ msgid "Viet-Nam, Democratic Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
-#, fuzzy
-#~ msgid "Wake Island"
-#~ msgstr "Faerské ostrovy"
+#~ msgid "Republic of Angola"
+#~ msgstr "Angolská republika"
-#, fuzzy
-#~ msgid "Yemen, Democratic, People's Democratic Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Angola"
+#~ msgstr "Angola"
-#, fuzzy
-#~ msgid "Yemen, Yemen Arab Republic"
-#~ msgstr "Sýrska arabská republika"
+#~ msgid "Principality of Andorra"
+#~ msgstr "Andorrské kniežatstvo"
-#, fuzzy
-#~ msgid "Yugoslavia, Socialist Federal Republic of"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
-#, fuzzy
-#~ msgid "Zaire, Republic of"
-#~ msgstr "Kórejská republika"
+#~ msgid "American Samoa"
+#~ msgstr "Americká Samoa"
-#~ msgid "The Transitional Islamic State of Afghanistan"
-#~ msgstr "Dočasný afganský islamský štát"
+#~ msgid "People's Democratic Republic of Algeria"
+#~ msgstr "Alžírska demokratická ľudová republika"
-#~ msgid "State of Bahrain"
-#~ msgstr "Bahrajnské kráľovstvo"
+#~ msgid "Republic of Albania"
+#~ msgstr "Albánska republika"
-#~ msgid "Kingdom of Nepal"
-#~ msgstr "Nepálske kráľovstvo"
+#~ msgid "Åland Islands"
+#~ msgstr "Ålandy"
-#~ msgid "Great Britain"
-#~ msgstr "Spojené kráľovstvo"
+#, fuzzy
+#~ msgid "Islamic Republic of Afghanistan"
+#~ msgstr "Pakistanská islamská republika"
+
+#~ msgid "Afghanistan"
+#~ msgstr "Afganistan"
diff --git a/slovak/po/distrib.sk.po b/slovak/po/distrib.sk.po
index da8331b8234..b99c4855290 100644
--- a/slovak/po/distrib.sk.po
+++ b/slovak/po/distrib.sk.po
@@ -136,17 +136,14 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
-#| msgid "64-bit PC (amd64)"
msgid "64-bit ARM (AArch64)"
msgstr "64-bitový ARM (AArch64)"
#: ../../english/releases/arches.data:12
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM (armel)"
#: ../../english/releases/arches.data:13
-#| msgid "Hard Float ABI ARM"
msgid "Hard Float ABI ARM (armhf)"
msgstr "ABI ARM s hardvérovým FPU (armhf)"
@@ -183,7 +180,6 @@ msgid "MIPS (big endian)"
msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "64-bitový MIPS (little endian)"
@@ -211,23 +207,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/slovak/po/doc.sk.po b/slovak/po/doc.sk.po
index 8f4541eb99f..e47da4df0a4 100644
--- a/slovak/po/doc.sk.po
+++ b/slovak/po/doc.sk.po
@@ -49,21 +49,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:185
-#: ../../english/doc/books.data:211
-#| 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."
+#: ../../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"
@@ -105,31 +92,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:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Debian 2.2 architektúra ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -141,7 +104,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -153,7 +116,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -161,6 +124,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autor:"
@@ -213,13 +192,13 @@ msgstr "(verzia <get-var version />)"
msgid "plain text"
msgstr "čistý text"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <a href=\""
-"https://www.debian.org/doc/cvs\">Subversion</a>."
+"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
@@ -236,24 +215,16 @@ 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>."
+"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: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>."
+"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 ""
@@ -285,6 +256,9 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
+#~ msgid "Language:"
+#~ msgstr "Jazyk:"
+
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
@@ -292,5 +266,12 @@ msgstr "PDF"
#~ "Pomocou <a href=\"cvs\">SVN</a> si môžete stiahnuť zdrojový text <get-var "
#~ "ddp_pkg_loc /> v SGML."
-#~ msgid "Language:"
-#~ msgstr "Jazyk:"
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <a "
+#~ "href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 architektúra ARM"
diff --git a/slovak/po/mailinglists.sk.po b/slovak/po/mailinglists.sk.po
index b54f2c871eb..a0dfb723380 100644
--- a/slovak/po/mailinglists.sk.po
+++ b/slovak/po/mailinglists.sk.po
@@ -131,8 +131,8 @@ msgstr "otvorené"
msgid "closed"
msgstr "zatvorené"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Prosím vyberte, do ktorých konferencií sa chcete prihlásiť:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Prosím vyberte, z ktorých konferencií sa chcete odhlásiť:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Prosím vyberte, do ktorých konferencií sa chcete prihlásiť:"
diff --git a/slovak/po/newsevents.sk.po b/slovak/po/newsevents.sk.po
index 8d6d7e6a4f9..cf506692dec 100644
--- a/slovak/po/newsevents.sk.po
+++ b/slovak/po/newsevents.sk.po
@@ -408,17 +408,12 @@ msgstr ""
"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 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 ""
-"Ak chcete tento newsletter dostávať emailom, <a href=\""
-"https://lists.debian.org/debian-news/\">prihláste sa do konferencie debian-"
-"news</a>."
+"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
diff --git a/slovak/po/organization.sk.po b/slovak/po/organization.sk.po
index 72dd82ae160..dd0eb956d4d 100644
--- a/slovak/po/organization.sk.po
+++ b/slovak/po/organization.sk.po
@@ -79,23 +79,22 @@ msgid "Officers"
msgstr "Predstavenstvo"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribúcia"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr "Komunikácia a PR"
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
-#| msgid "Publicity"
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Marketingový tím"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Podpora a infraštruktúra"
@@ -112,180 +111,179 @@ msgstr "Vedúci"
msgid "Technical Committee"
msgstr "Technická komisia"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekretár"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Vývojové projekty"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP archívy"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP asistenti"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "FTP Wizards"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Spätné porty"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Tím spätných portov"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Jednotlivé balíky"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Správa vydaní"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Tím vydania"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Zabezpečenie kvality"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Tím inštalátora"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Poznámky k vydaniu"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Obrazy CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produkcia"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testovanie"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infraštruktúra automatického zostavovania"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Tím wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Správa buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentácia"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Balíky, ktoré potrebujú pomoc a perspektívne balíky"
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Tím Live systému"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Porty"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Špeciálne konfigurácie"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Notebooky"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Firewally"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Vnorené systémy"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Tlačový kontakt"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Webstránky"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "PR"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Projekt Ženy Debianu"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Boj proti obťažovaniu"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Udalosti"
-#: ../../english/intro/organization.data:273
-#| msgid "Technical Committee"
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "Komisia DebConf"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Partnerský program"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Koordinácia darov hardvéru"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Používateľská podpora"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Systém sledovania chýb"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Správa konferencií a archívov konferencií"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Recepcia nových členov"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Správcovia účtov Debianu"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -293,31 +291,31 @@ msgstr ""
"Ak chcete poslať súkromnú správu všetkým DAM, použite kľúč GPG "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Správcovia kľúčov (PGP a GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Bezpečnostný tím"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Stránka konzultantov"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Stránka dodávateľov CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Politika"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Správa systému"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -326,7 +324,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:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -336,127 +334,144 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Správca LDAP adresára vývojárov"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Zrkadlá"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Správca DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Systém sledovania balíkov"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
-#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:450
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>"
+"Žiadosti o použitie <a name=\"trademark\" href=\"m4_HOME/trademark"
+"\">ochranných známok</a>"
+
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Správcovia Alioth"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Správcovia Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian pre deti od 1 do 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian pre medicínsku prax a výskum"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian pre vzdelávanie"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian v právnických kanceláriách"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian pre ľudí s postihnutiami"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian pre vedu a súvisiaci výskum"
-#~ msgid "Publicity"
-#~ msgstr "Publicita"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian pre vzdelávanie"
-#~ msgid "Bits from Debian"
-#~ msgstr "Čriepky z Debianu"
+#~ msgid "Testing Security Team"
+#~ msgstr "Bezpečnostný tím pre „testing“"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Tím správcov zväzku kľúčov správcov Debianu (DM)"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt Bezpečnostný audit"
-#~ msgid "DebConf chairs"
-#~ msgstr "Predsedovia DebConf"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "súčasný líder projektu Debian"
-#~ msgid "Volatile Team"
-#~ msgstr "Tím volatile"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Mená správcov jednotlivých buildd nájdete tiež na <a href=\"http://www."
+#~ "buildd.net\">http://www.buildd.net</a>. Vyberte si architektúru a "
+#~ "distribúciu pre ktorú chcete zobraziť správcov buildd."
-#~ msgid "Vendors"
-#~ msgstr "Dodávatelia"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Správcov zodpovedajúcich za buildd konkrétnej architekúry môžete "
+#~ "zastihnúť na <genericemail arch@buildd.debian.org>, napr. <genericemail "
+#~ "i386@buildd.debian.org>."
-#~ msgid "Handhelds"
-#~ msgstr "Handheldy"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian pre neziskové organizácie"
-#~ msgid "Marketing Team"
-#~ msgstr "Marketingový tím"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Univerzálny operačný systém pre pracovnú stanicu"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinácia podpisovania kľúčov"
+#~ msgid "Accountant"
+#~ msgstr "Účtovník"
+
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Tím vydania „stable“"
#~ msgid "Custom Debian Distributions"
#~ msgstr "Prispôsobené distribúcie Debianu"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Tím vydania „stable“"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinácia podpisovania kľúčov"
-#~ msgid "Accountant"
-#~ msgstr "Účtovník"
+#~ msgid "Marketing Team"
+#~ msgstr "Marketingový tím"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Univerzálny operačný systém pre pracovnú stanicu"
+#~ msgid "Handhelds"
+#~ msgstr "Handheldy"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian pre neziskové organizácie"
+#~ msgid "Vendors"
+#~ msgstr "Dodávatelia"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Správcov zodpovedajúcich za buildd konkrétnej architekúry môžete "
-#~ "zastihnúť na <genericemail arch@buildd.debian.org>, napr. <genericemail "
-#~ "i386@buildd.debian.org>."
+#~ msgid "Volatile Team"
+#~ msgstr "Tím volatile"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Mená správcov jednotlivých buildd nájdete tiež na <a href=\"http://www."
-#~ "buildd.net\">http://www.buildd.net</a>. Vyberte si architektúru a "
-#~ "distribúciu pre ktorú chcete zobraziť správcov buildd."
+#~ msgid "DebConf chairs"
+#~ msgstr "Predsedovia DebConf"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "súčasný líder projektu Debian"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Tím správcov zväzku kľúčov správcov Debianu (DM)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projekt Bezpečnostný audit"
+#~ msgid "Bits from Debian"
+#~ msgstr "Čriepky z Debianu"
-#~ msgid "Testing Security Team"
-#~ msgstr "Bezpečnostný tím pre „testing“"
+#~ msgid "Publicity"
+#~ msgstr "Publicita"
+
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
+
+#~ 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..2c09f2fa563 100644
--- a/slovak/po/others.sk.po
+++ b/slovak/po/others.sk.po
@@ -334,17 +334,17 @@ msgstr "Verzia"
msgid "URL"
msgstr "URL"
-#~ msgid "Where:"
-#~ msgstr "Kde:"
+#~ msgid "Wanted:"
+#~ msgstr "Hľadá sa:"
-#~ msgid "Specifications:"
-#~ msgstr "Špecifikácie:"
+#~ msgid "Who:"
+#~ msgstr "Kto:"
#~ msgid "Architecture:"
#~ msgstr "Architektúra:"
-#~ msgid "Who:"
-#~ msgstr "Kto:"
+#~ msgid "Specifications:"
+#~ msgstr "Špecifikácie:"
-#~ msgid "Wanted:"
-#~ msgstr "Hľadá sa:"
+#~ msgid "Where:"
+#~ msgstr "Kde:"
diff --git a/slovak/po/partners.sk.po b/slovak/po/partners.sk.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/slovak/po/partners.sk.po
+++ b/slovak/po/partners.sk.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/slovak/po/ports.sk.po b/slovak/po/ports.sk.po
index 30451e57948..f56de985a9c 100644
--- a/slovak/po/ports.sk.po
+++ b/slovak/po/ports.sk.po
@@ -119,32 +119,32 @@ msgstr "Debian pre PowerPC"
msgid "Debian for Sparc"
msgstr "Debian pre Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian pre notebooky"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian pre AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian pre Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian pre ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian pre S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian pre Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian pre MIPS"
-#~ msgid "Main"
-#~ msgstr "Hlavné"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian pre Motorola 680x0"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian pre Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Hlavné"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian pre MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian pre Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian pre S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian pre ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian pre Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian pre AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian pre notebooky"
diff --git a/slovak/po/stats.sk.po b/slovak/po/stats.sk.po
index 630d1358398..f2c5607ab35 100644
--- a/slovak/po/stats.sk.po
+++ b/slovak/po/stats.sk.po
@@ -31,79 +31,90 @@ msgstr "%d bajtov na preloženie."
msgid "There are %d strings to translate."
msgstr "%d reťazcov na preloženie."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Tento preklad je príliš zastaraný"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Nesprávna verzia prekladu"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Tento preklad je príliš zastaraný"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Originál je novší ako tento preklad"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Originál už neexistuje"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "počet zásahov nedostupný"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "zásahov"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Kliknutím stiahnete údaje diffstat"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Zjednotený diff"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Zafarbený diff"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Zafarbený diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Zhrnutie pamäte prekladov pre"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Nepreložené"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Zastarané"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Preložené"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Aktuálne"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "súborov"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bajtov"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -111,131 +122,131 @@ msgstr ""
"Pozn.: zoznamy stránok sú zoradené podľa popularity. Ak podržíte myš nad "
"názvom stránky, uvidíte počet zásahov."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Zastarané preklady"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Súbor"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Komentár"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Záznam"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Preklad"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Správca"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Stav"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Prekladateľ"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Dátum"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Všeobecné stránky nepreložené"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Nepreložené všeobecné stránky"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Novinky nepreložené"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Nepreložené novinky"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Stránky konzultantov používateľov nepreložené"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Nepreložené stránky konzultantov používateľov"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Medzinárodné stránky nepreložené"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Nepreložené medzinárodné stránky"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Preložené stránky (aktuálne)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Preložené šablóny (súbory .po)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Štatistika prekladov .po"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Fuzzy"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Nepreložené"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Celkom"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Celkom:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Preložené webstránky"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Štatistika prekladov podľa počtu stránok"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Jazyk"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Preklady"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Preložené webstránky (podľa veľkosti)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Štatistika prekladov podľa veľkosti stránky"
diff --git a/slovak/po/templates.sk.po b/slovak/po/templates.sk.po
index 76f6aa58428..6b766708b82 100644
--- a/slovak/po/templates.sk.po
+++ b/slovak/po/templates.sk.po
@@ -203,25 +203,26 @@ msgstr "vo vydaní 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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>."
+#| "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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Ak chcete nahlásiť problém týkajúci sa webových stránok, pošlite e-mail na "
-"adresu <a href=\"mailto:debian-www@lists.debian.org\">debian-"
-"www@lists.debian.org</a> našej konferencie, ktorej archív je verejný. Ďalšie "
-"kontakty získate na stránke <a href=\"m4_HOME/contact\">kontaktov</a> "
-"Debianu. Je k dispozícii aj <a href=\"m4_HOME/devel/website/using_cvs\">"
-"zdrojový kód webu Debianu</a>."
+"adresu <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> našej konferencie, ktorej archív je verejný. Ďalšie kontakty "
+"získate na stránke <a href=\"m4_HOME/contact\">kontaktov</a> Debianu. Je k "
+"dispozícii aj <a href=\"m4_HOME/devel/website/using_cvs\">zdrojový kód webu "
+"Debianu</a>."
#: ../../english/template/debian/footer.wml:108
msgid "Last Modified"
@@ -303,7 +304,6 @@ msgid "Debian Books"
msgstr "Knihy o Debiane"
#: ../../english/template/debian/links.tags.wml:37
-#| msgid "Debian"
msgid "Debian Wiki"
msgstr "Debian Wiki"
@@ -514,6 +514,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Pozn.:</em> Pôvodný dokument tohto prekladu už neexistuje."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -522,197 +526,183 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Späť na stránku <a href=\"../\">Kto používa Debian?</a>."
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Ak nás chcete kontaktovať, pozrite se najskôr na <a href=\"m4_HOME/contact"
-#~ "\">kontaktnú stránku</a>."
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Navštívte sponzora"
-#~ msgid "package info"
-#~ msgstr "info o balíku"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Narazili ste na problém so vzhľadom stránky?"
-#~ msgid "requested %s days ago."
-#~ msgstr "vyžiadaný pred %s dňami."
+#~ msgid "Report it!"
+#~ msgstr "Nahláste ho!"
-#~ msgid "requested yesterday."
-#~ msgstr "vyžiadaný včera."
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Zvoľte si najbližší server: &nbsp;"
-#~ msgid "requested today."
-#~ msgstr "vyžiadaný dnes."
+#~ msgid "More information:"
+#~ msgstr "Ďalšie informácie:"
-#~ msgid "%s days in preparation."
-#~ msgstr "v príprave %s dní."
+#~ msgid "Taken by:"
+#~ msgstr "Rezervoval si:"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "v príprave od včera."
+#~ msgid "Nobody"
+#~ msgstr "Nikto"
-#~ msgid "in preparation since today."
-#~ msgstr "v príprave od dnes."
+#~ msgid "Rating:"
+#~ msgstr "Hodnotenie:"
-#~ msgid "%s days in adoption."
-#~ msgstr "adoptovaný pre %s dňami."
+#~ msgid "More information"
+#~ msgstr "Ďalšie informácie"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "adoptovaný od včera"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "in adoption since today."
-#~ msgstr "adoptovaný od dnes."
+#~ msgid "Download with Jigdo"
+#~ msgstr "Stiahnuť pomocou Jigdo"
-#~ msgid "No help requested"
-#~ msgstr "Nevyžaduje sa žiadna pomoc"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Stiahnuť pomocou HTTP/FTP"
-#~ msgid "No Requested packages"
-#~ msgstr "Žiadne Žiadané balíky"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Kúpiť CD alebo DVD"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Žiadne balíky čakajúce na zabalenie"
+#~ msgid "Network Install"
+#~ msgstr "Sieťová inštalácia"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Žiadne balíky čakajúce na adopciu"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Stiahnuť"
-#~ msgid "No orphaned packages"
-#~ msgstr "Žiadne osirotené balíky"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Rôzne"
-#~ msgid "No requests for adoption"
-#~ msgstr "Žiadne žiadosti o adopciu"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Umenie"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Preložili ho %s."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Zrkadlá"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Preložila ho %s."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Zrkadlá rsync"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Preložili ho %s."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Stiahnuť pomocou torrent"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Preložil ho %s."
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Sada pseudo obrazov"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Info o vydaniach obrazov"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD tím"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Týždenník Debianu (DWN) vydávajú <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_on_cd"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Týždenník Debianu (DWN) vydáva <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Sú dostupné <a href=\"../../\">staršie vydania</a> tohto týždenníka."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "buy"
+#~ msgstr "kúpiť"
+
+#~ msgid "net_install"
+#~ msgstr "sieťová_inštalácia"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />rozličné"
#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Ak chcete dostávať tento týždenník emailom, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">prihláste sa do konferencie debian-news</a>."
+#~ "Anglická <a href=\"/MailingLists/disclaimer\">verejná konferencia</a> o "
+#~ "CD/DVD:"
-#~ msgid "Other"
-#~ msgstr "Iné"
+#~ msgid "List of Consultants"
+#~ msgstr "Zoznam konzultantov"
-#~ msgid "Withdrawn"
-#~ msgstr "Stiahnuté"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Späť na stránku <a href=\"./\">Konzultantov Debianu</a>."
-#~ msgid "Decided"
-#~ msgstr "Rozhodnuté"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Najbližšie zaujímavosti"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Hlasovanie&nbsp;prebieha"
+#~ msgid "link may no longer be valid"
+#~ msgstr "odkaz už nemusí byť platný"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Diskutuje&nbsp;sa"
+#~ msgid "When"
+#~ msgstr "Kedy"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Čaká&nbsp;sa&nbsp;na&nbsp;sponzorov"
+#~ msgid "Where"
+#~ msgstr "Kde"
-#~ msgid "Outcome"
-#~ msgstr "Výsledok"
+#~ msgid "More Info"
+#~ msgstr "Ďalšie informácie"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Minimálna diskusia"
+#~ msgid "Debian Involvement"
+#~ msgstr "Zapojenie sa do Debianu"
-#~ msgid "Platforms"
-#~ msgstr "Platformy"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hlavný koordinátor"
-#~ msgid "Debate"
-#~ msgstr "Diskusia"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Koordinátor</th><th>Projektu</th>"
-#~ msgid "Nominations"
-#~ msgstr "Nominácie"
+#~ msgid "Related Links"
+#~ msgstr "Súvisiace odkazy"
-#~ msgid "Date"
-#~ msgstr "Dátum"
+#~ msgid "Latest News"
+#~ msgstr "Posledné novinky"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Späť na stránku <a href=\"./\">Zoznam prednášajúcich o Debiane</a>."
+#~ msgid "Download calendar entry"
+#~ msgstr "Stiahnuť záznam kalendára"
-#~ msgid "List of Speakers"
-#~ msgstr "Zoznam prednášajúcich"
+#~ msgid "License Information"
+#~ msgstr "Licenčné informácie"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (nefunkčný odkaz)"
+#~ msgid "DLS Index"
+#~ msgstr "Index DLS"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Späť na: ďalšie <a href=\"./\">novinky Debianu</a> || <a href=\"m4_HOME/"
-#~ "\">úvodnú stránku projektu Debian</a>."
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Prehľad Zhrnutí licencií Debianu (DLS - Debian License Summaries) nájdete "
-#~ "na stránke <a href=\"./\">license information</a>."
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "Not Redistributable"
-#~ msgstr "Nešíriteľný"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Archív Debian-Legal"
-#~ msgid "Non-Free"
-#~ msgstr "Neslobodný"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Free"
-#~ msgstr "Slobodný"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Verzia %s: %s"
-#~ msgid "not redistributable"
-#~ msgstr "nešíriteľný"
+#~ msgid "Date published"
+#~ msgstr "Dátum zverejnenia"
-#~ msgid "non-free"
-#~ msgstr "neslobodný"
+#~ msgid "License"
+#~ msgstr "Licencia"
-#~ msgid "free"
-#~ msgstr "slobodný"
+#~ msgid "Version"
+#~ msgstr "Verzia"
-#~ msgid "License text"
-#~ msgstr "License text"
+#~ msgid "Summary"
+#~ msgstr "Zhrnutie"
-#~ msgid "License text (translated)"
-#~ msgstr "Text licencie (preložený)"
+#~ msgid "Justification"
+#~ msgstr "Zdôvodnenie"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Toto zhrnutie pripravil <summary-author/>."
+#~ msgid "Discussion"
+#~ msgstr "Diskusia"
+
+#~ msgid "Original Summary"
+#~ msgstr "Pôvodné zhrnutie"
#~ msgid ""
#~ "The original summary by <summary-author/> can be found in the <a href="
@@ -721,180 +711,194 @@ msgstr "Späť na stránku <a href=\"../\">Kto používa Debian?</a>."
#~ "Pôvodné zhrnutie od <summary-author/> nájdete v <a href=\"<summary-url/>"
#~ "\">archívoch konferencie</a>."
-#~ msgid "Original Summary"
-#~ msgstr "Pôvodné zhrnutie"
-
-#~ msgid "Discussion"
-#~ msgstr "Diskusia"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Toto zhrnutie pripravil <summary-author/>."
-#~ msgid "Justification"
-#~ msgstr "Zdôvodnenie"
+#~ msgid "License text (translated)"
+#~ msgstr "Text licencie (preložený)"
-#~ msgid "Summary"
-#~ msgstr "Zhrnutie"
+#~ msgid "License text"
+#~ msgstr "License text"
-#~ msgid "Version"
-#~ msgstr "Verzia"
+#~ msgid "free"
+#~ msgstr "slobodný"
-#~ msgid "License"
-#~ msgstr "Licencia"
+#~ msgid "non-free"
+#~ msgstr "neslobodný"
-#~ msgid "Date published"
-#~ msgstr "Dátum zverejnenia"
+#~ msgid "not redistributable"
+#~ msgstr "nešíriteľný"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Verzia %s: %s"
+#~ msgid "Free"
+#~ msgstr "Slobodný"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Non-Free"
+#~ msgstr "Neslobodný"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Archív Debian-Legal"
+#~ msgid "Not Redistributable"
+#~ msgstr "Nešíriteľný"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Prehľad Zhrnutí licencií Debianu (DLS - Debian License Summaries) nájdete "
+#~ "na stránke <a href=\"./\">license information</a>."
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Späť na: ďalšie <a href=\"./\">novinky Debianu</a> || <a href=\"m4_HOME/"
+#~ "\">úvodnú stránku projektu Debian</a>."
-#~ msgid "DLS Index"
-#~ msgstr "Index DLS"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (nefunkčný odkaz)"
-#~ msgid "License Information"
-#~ msgstr "Licenčné informácie"
+#~ msgid "List of Speakers"
+#~ msgstr "Zoznam prednášajúcich"
-#~ msgid "Download calendar entry"
-#~ msgstr "Stiahnuť záznam kalendára"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Späť na stránku <a href=\"./\">Zoznam prednášajúcich o Debiane</a>."
-#~ msgid "Latest News"
-#~ msgstr "Posledné novinky"
+#~ msgid "Date"
+#~ msgstr "Dátum"
-#~ msgid "Related Links"
-#~ msgstr "Súvisiace odkazy"
+#~ msgid "Nominations"
+#~ msgstr "Nominácie"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Koordinátor</th><th>Projektu</th>"
+#~ msgid "Debate"
+#~ msgstr "Diskusia"
-#~ msgid "Main Coordinator"
-#~ msgstr "Hlavný koordinátor"
+#~ msgid "Platforms"
+#~ msgstr "Platformy"
-#~ msgid "Debian Involvement"
-#~ msgstr "Zapojenie sa do Debianu"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Minimálna diskusia"
-#~ msgid "More Info"
-#~ msgstr "Ďalšie informácie"
+#~ msgid "Outcome"
+#~ msgstr "Výsledok"
-#~ msgid "Where"
-#~ msgstr "Kde"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Čaká&nbsp;sa&nbsp;na&nbsp;sponzorov"
-#~ msgid "When"
-#~ msgstr "Kedy"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Diskutuje&nbsp;sa"
-#~ msgid "link may no longer be valid"
-#~ msgstr "odkaz už nemusí byť platný"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Hlasovanie&nbsp;prebieha"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Najbližšie zaujímavosti"
+#~ msgid "Decided"
+#~ msgstr "Rozhodnuté"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Späť na stránku <a href=\"./\">Konzultantov Debianu</a>."
+#~ msgid "Withdrawn"
+#~ msgstr "Stiahnuté"
-#~ msgid "List of Consultants"
-#~ msgstr "Zoznam konzultantov"
+#~ msgid "Other"
+#~ msgstr "Iné"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "Anglická <a href=\"/MailingLists/disclaimer\">verejná konferencia</a> o "
-#~ "CD/DVD:"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />rozličné"
-
-#~ msgid "net_install"
-#~ msgstr "sieťová_inštalácia"
-
-#~ msgid "buy"
-#~ msgstr "kúpiť"
-
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ "Ak chcete dostávať tento týždenník emailom, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">prihláste sa do konferencie debian-news</a>."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Sú dostupné <a href=\"../../\">staršie vydania</a> tohto týždenníka."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Týždenník Debianu (DWN) vydáva <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_on_cd"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Týždenník Debianu (DWN) vydávajú <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD tím"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Info o vydaniach obrazov"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Sada pseudo obrazov"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Preložil ho %s."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Stiahnuť pomocou torrent"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Preložili ho %s."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Zrkadlá rsync"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Preložila ho %s."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Zrkadlá"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Preložili ho %s."
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Umenie"
+#~ msgid "No requests for adoption"
+#~ msgstr "Žiadne žiadosti o adopciu"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Rôzne"
+#~ msgid "No orphaned packages"
+#~ msgstr "Žiadne osirotené balíky"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Stiahnuť"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Žiadne balíky čakajúce na adopciu"
-#~ msgid "Network Install"
-#~ msgstr "Sieťová inštalácia"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Žiadne balíky čakajúce na zabalenie"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Kúpiť CD alebo DVD"
+#~ msgid "No Requested packages"
+#~ msgstr "Žiadne Žiadané balíky"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Stiahnuť pomocou HTTP/FTP"
+#~ msgid "No help requested"
+#~ msgstr "Nevyžaduje sa žiadna pomoc"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Stiahnuť pomocou Jigdo"
+#~ msgid "in adoption since today."
+#~ msgstr "adoptovaný od dnes."
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "adoptovaný od včera"
-#~ msgid "More information"
-#~ msgstr "Ďalšie informácie"
+#~ msgid "%s days in adoption."
+#~ msgstr "adoptovaný pre %s dňami."
-#~ msgid "Rating:"
-#~ msgstr "Hodnotenie:"
+#~ msgid "in preparation since today."
+#~ msgstr "v príprave od dnes."
-#~ msgid "Nobody"
-#~ msgstr "Nikto"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "v príprave od včera."
-#~ msgid "Taken by:"
-#~ msgstr "Rezervoval si:"
+#~ msgid "%s days in preparation."
+#~ msgstr "v príprave %s dní."
-#~ msgid "More information:"
-#~ msgstr "Ďalšie informácie:"
+#~ msgid "requested today."
+#~ msgstr "vyžiadaný dnes."
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Zvoľte si najbližší server: &nbsp;"
+#~ msgid "requested yesterday."
+#~ msgstr "vyžiadaný včera."
-#~ msgid "Report it!"
-#~ msgstr "Nahláste ho!"
+#~ msgid "requested %s days ago."
+#~ msgstr "vyžiadaný pred %s dňami."
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Narazili ste na problém so vzhľadom stránky?"
+#~ msgid "package info"
+#~ msgstr "info o balíku"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Navštívte sponzora"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Ak nás chcete kontaktovať, pozrite se najskôr na <a href=\"m4_HOME/contact"
+#~ "\">kontaktnú stránku</a>."
diff --git a/slovak/po/vendors.sk.po b/slovak/po/vendors.sk.po
index 331f440c871..88ffc3c5a01 100644
--- a/slovak/po/vendors.sk.po
+++ b/slovak/po/vendors.sk.po
@@ -72,29 +72,29 @@ msgstr "zdroj"
msgid "and"
msgstr "a"
-#~ msgid "Architectures:"
-#~ msgstr "Architektúry:"
+#~ msgid "Vendor:"
+#~ msgstr "Dodávateľ:"
-#~ msgid "DVD Type:"
-#~ msgstr "Typ DVD:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL stránky Debianu:"
-#~ msgid "CD Type:"
-#~ msgstr "Typ CD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Umožňuje príspevky do Debianu:"
-#~ msgid "email:"
-#~ msgstr "email:"
+#~ msgid "Country:"
+#~ msgstr "Krajina:"
#~ msgid "Ship International:"
#~ msgstr "Medzinárodné dodanie:"
-#~ msgid "Country:"
-#~ msgstr "Krajina:"
+#~ msgid "email:"
+#~ msgstr "email:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Umožňuje príspevky do Debianu:"
+#~ msgid "CD Type:"
+#~ msgstr "Typ CD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL stránky Debianu:"
+#~ msgid "DVD Type:"
+#~ msgstr "Typ DVD:"
-#~ msgid "Vendor:"
-#~ msgstr "Dodávateľ:"
+#~ msgid "Architectures:"
+#~ msgstr "Architektúry:"
diff --git a/slovak/po/vote.sk.po b/slovak/po/vote.sk.po
index d5cdb8fe1bb..509cb0aaf9f 100644
--- a/slovak/po/vote.sk.po
+++ b/slovak/po/vote.sk.po
@@ -170,17 +170,14 @@ msgid "Amendment Text B"
msgstr "Text dodatku B"
#: ../../english/template/debian/votebar.wml:127
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "Dodatok navrhuje C"
#: ../../english/template/debian/votebar.wml:130
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "Dodatok sekunduje C"
#: ../../english/template/debian/votebar.wml:133
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "Text dodatku C"
diff --git a/slovene/po/blends.sl.po b/slovene/po/blends.sl.po
index 64b8c15bf29..b00934651af 100644
--- a/slovene/po/blends.sl.po
+++ b/slovene/po/blends.sl.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/slovene/po/bugs.sl.po b/slovene/po/bugs.sl.po
index a951bff6649..0ad1dbd90ae 100644
--- a/slovene/po/bugs.sl.po
+++ b/slovene/po/bugs.sl.po
@@ -164,79 +164,79 @@ msgstr "arhivirane napake"
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "Flags:"
-#~ msgstr "Zastavice"
-
-#~ msgid "active bugs"
-#~ msgstr "aktivne napake"
-
-#~ msgid "no ordering by status or severity"
-#~ msgstr "brez razvrščanja po stanju in resnosti"
-
-#~ msgid "bugs"
-#~ msgstr "napake"
-
-#~ msgid "open"
-#~ msgstr "odprto"
-
-#~ msgid "forwarded"
-#~ msgstr "posredovano"
-
-#~ msgid "pending"
-#~ msgstr "v čakanju"
+#, fuzzy
+#~ msgid "Exclude tag:"
+#~ msgstr "Izključi stanje"
-#~ msgid "fixed"
-#~ msgstr "popravljeno"
+#, fuzzy
+#~ msgid "Include tag:"
+#~ msgstr "Vključi stanje"
-#~ msgid "done"
-#~ msgstr "končano"
+#, fuzzy
+#~ msgid "moreinfo"
+#~ msgstr "manj pomembno"
#, fuzzy
-#~ msgid "Include status:"
-#~ msgstr "Vključi stanje"
+#~ msgid "potato"
+#~ msgstr "pomembno"
#, fuzzy
-#~ msgid "Exclude status:"
+#~ msgid "Exclude severity:"
#~ msgstr "Izključi stanje"
-#~ msgid "critical"
-#~ msgstr "kritično"
+#, fuzzy
+#~ msgid "Include severity:"
+#~ msgstr "Vključi resnost"
-#~ msgid "grave"
-#~ msgstr "težko"
+#~ msgid "wishlist"
+#~ msgstr "želja"
-#~ msgid "serious"
-#~ msgstr "resno"
+#~ msgid "minor"
+#~ msgstr "manj pomembno"
#~ msgid "important"
#~ msgstr "pomembno"
-#~ msgid "minor"
-#~ msgstr "manj pomembno"
+#~ msgid "serious"
+#~ msgstr "resno"
-#~ msgid "wishlist"
-#~ msgstr "želja"
+#~ msgid "grave"
+#~ msgstr "težko"
-#, fuzzy
-#~ msgid "Include severity:"
-#~ msgstr "Vključi resnost"
+#~ msgid "critical"
+#~ msgstr "kritično"
#, fuzzy
-#~ msgid "Exclude severity:"
+#~ msgid "Exclude status:"
#~ msgstr "Izključi stanje"
#, fuzzy
-#~ msgid "potato"
-#~ msgstr "pomembno"
+#~ msgid "Include status:"
+#~ msgstr "Vključi stanje"
-#, fuzzy
-#~ msgid "moreinfo"
-#~ msgstr "manj pomembno"
+#~ msgid "done"
+#~ msgstr "končano"
-#, fuzzy
-#~ msgid "Include tag:"
-#~ msgstr "Vključi stanje"
+#~ msgid "fixed"
+#~ msgstr "popravljeno"
-#, fuzzy
-#~ msgid "Exclude tag:"
-#~ msgstr "Izključi stanje"
+#~ msgid "pending"
+#~ msgstr "v čakanju"
+
+#~ msgid "forwarded"
+#~ msgstr "posredovano"
+
+#~ msgid "open"
+#~ msgstr "odprto"
+
+#~ msgid "bugs"
+#~ msgstr "napake"
+
+#~ msgid "no ordering by status or severity"
+#~ msgstr "brez razvrščanja po stanju in resnosti"
+
+#~ msgid "active bugs"
+#~ msgstr "aktivne napake"
+
+#~ msgid "Flags:"
+#~ msgstr "Zastavice"
diff --git a/slovene/po/countries.sl.po b/slovene/po/countries.sl.po
index 9e564501681..68055880b34 100644
--- a/slovene/po/countries.sl.po
+++ b/slovene/po/countries.sl.po
@@ -435,8 +435,8 @@ msgstr "Južna Afrika"
msgid "Zimbabwe"
msgstr "Zimbabve"
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoslavija"
-
#~ msgid "Great Britain"
#~ msgstr "Velika Britanija"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavija"
diff --git a/slovene/po/doc.sl.po b/slovene/po/doc.sl.po
index 48ae4444fbf..b12d0b240bc 100644
--- a/slovene/po/doc.sl.po
+++ b/slovene/po/doc.sl.po
@@ -26,8 +26,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -87,7 +63,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -107,6 +83,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Avtor:"
@@ -160,10 +152,10 @@ msgstr "(razlicxica <get-var version />)"
msgid "plain text"
msgstr "navadno besedilo"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -188,12 +180,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -226,15 +212,8 @@ msgstr ""
msgid "PDF"
msgstr ""
-#, fuzzy
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Uporabite <a href=\"cvs\">CVS</a> za prenos izvornega besedila v SGML."
-
-#~ msgid "Latest version in development:"
-#~ msgstr "Najnovejsxa razlicxica v razvoju:"
+#~ msgid "Language:"
+#~ msgstr "Jezik:"
#~ msgid ""
#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -254,5 +233,12 @@ msgstr ""
#~ "<pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy co <get-"
#~ "var doc /></pre>"
-#~ msgid "Language:"
-#~ msgstr "Jezik:"
+#~ msgid "Latest version in development:"
+#~ msgstr "Najnovejsxa razlicxica v razvoju:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Uporabite <a href=\"cvs\">CVS</a> za prenos izvornega besedila v SGML."
diff --git a/slovene/po/l10n.sl.po b/slovene/po/l10n.sl.po
index b623e95bb33..05a7b0a40cb 100644
--- a/slovene/po/l10n.sl.po
+++ b/slovene/po/l10n.sl.po
@@ -94,8 +94,8 @@ msgstr "POT datoteke"
msgid "Hints for translators"
msgstr "Namigi za prevajalce"
-#~ msgid "Translated templates"
-#~ msgstr "Prevedene predloge"
-
#~ msgid "Original templates"
#~ msgstr "Izvirne predloge"
+
+#~ msgid "Translated templates"
+#~ msgstr "Prevedene predloge"
diff --git a/slovene/po/organization.sl.po b/slovene/po/organization.sl.po
index c045602c289..0dec2f9434a 100644
--- a/slovene/po/organization.sl.po
+++ b/slovene/po/organization.sl.po
@@ -74,24 +74,24 @@ msgid "Officers"
msgstr "Funkcionarji"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distribucija"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Odnosi z javnostjo"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Podpora in infrastruktura"
@@ -108,228 +108,226 @@ msgstr "Vodja"
msgid "Technical Committee"
msgstr "Tehnicxna komisija"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Tajnik"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Razvojni projekti"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Arhive FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Posamezni paketi"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Upravljanje izdaje"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
#, fuzzy
msgid "Release Team"
msgstr "Upravitelj izdaje"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Zagotavljanje kakovosti"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Skupina za namestitveni sistem"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
#, fuzzy
msgid "Release Notes"
msgstr "Upravitelj izdaje"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD Images"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produkcija"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testiranje"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Podpora in infrastruktura"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
#, fuzzy
msgid "Work-Needing and Prospective Packages list"
msgstr "Seznam nadebudnih in dela potrebnih paketov"
-#: ../../english/intro/organization.data:178
-#, fuzzy
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "Skupina za namestitveni sistem"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Druge platforme"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Posebne konfiguracije"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Prenosni racxunalniki"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Pozxarni zidovi"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Predstavnik za tisk"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Spletne strani"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Razvojni projekti"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Dogodki"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Tehnicxna komisija"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Partnerski program"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Podpora uporabnikov"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Sledilnik napak"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administracija posxtnih seznamov"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Sprejemnica za nove vzdrzxevalce"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
#, fuzzy
msgid "Debian Account Managers"
msgstr "Upravitelji uporabnisxkih imen razvijalcev"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Vzdrzxevalci kljucxev (PGP in GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Skupina za varnost"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Svetovalska stran"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
#, fuzzy
msgid "CD Vendors Page"
msgstr "Prodajalci"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Pravilnik"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -338,7 +336,7 @@ msgstr ""
"od Debianovih racxunalnikov, vkljucxno s tezxavami z gesli in paketi, ki jih "
"potrebujete."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -348,97 +346,111 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debianovi racxunalniki</a>, kjer "
"boste nasxli podatke o administratorjih posameznih racxunalnikov."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Skrbnik imenika razvijalcev LDAP"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Zrcalni strezxniki"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Vzdrzxevalec DNSa"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Sledilnikov paketov"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+msgid "Salsa administrators"
+msgstr "Sistemska administracija"
+
+#: ../../english/intro/organization.data:457
#, fuzzy
msgid "Alioth administrators"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr ""
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr ""
-#~ msgid "Publicity"
-#~ msgstr "Odnosi z javnostjo"
+#: ../../english/intro/organization.data:492
+msgid "Debian for astronomy"
+msgstr ""
#, fuzzy
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribucija"
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Skupina za varnost"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Upravitelj izdaje ''stable''"
+#, fuzzy
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Skupina za namestitveni sistem"
-#~ msgid "Vendors"
-#~ msgstr "Prodajalci"
+#~ msgid "Delegates"
+#~ msgstr "Delegati"
-#~ msgid "APT Team"
-#~ msgstr "Skupina za APT"
+#~ msgid "Installation"
+#~ msgstr "Namestitev"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Arhive posxtnih seznamov"
+#~ msgid "Mailing list"
+#~ msgstr "Posxtni seznam"
#, fuzzy
#~ msgid "Security Testing Team"
#~ msgstr "Skupina za varnost"
-#~ msgid "Mailing list"
-#~ msgstr "Posxtni seznam"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Arhive posxtnih seznamov"
-#~ msgid "Installation"
-#~ msgstr "Namestitev"
+#~ msgid "APT Team"
+#~ msgstr "Skupina za APT"
-#~ msgid "Delegates"
-#~ msgstr "Delegati"
+#~ msgid "Vendors"
+#~ msgstr "Prodajalci"
+
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Upravitelj izdaje ''stable''"
#, fuzzy
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Skupina za namestitveni sistem"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribucija"
+
+#~ msgid "Publicity"
+#~ msgstr "Odnosi z javnostjo"
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "Skupina za varnost"
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "Skupina za namestitveni sistem"
diff --git a/slovene/po/others.sl.po b/slovene/po/others.sl.po
index ad5ff58ef5a..1c7132c25d8 100644
--- a/slovene/po/others.sl.po
+++ b/slovene/po/others.sl.po
@@ -319,23 +319,8 @@ msgstr ""
msgid "URL"
msgstr ""
-#~ msgid "p<get-var page />"
-#~ msgstr "str. <get-var page />"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "je "
-
-#~ msgid "Subscription:"
-#~ msgstr "Prijava:"
-
-#~ msgid "Moderated:"
-#~ msgstr "Moderiran:"
-
-#~ msgid "No description given"
-#~ msgstr "Ni opisa"
-
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Izberite poxtne sezname, na katere se zxelite prijaviti"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Prijava na posxtni seznam"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -346,5 +331,20 @@ msgstr ""
#~ "#subunsub\">posxtni seznami</a>. Na voljo je tudi <a href=\"unsubscribe"
#~ "\">spletni obrazec za odjavljanje</a> s posxtnih seznamov."
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Prijava na posxtni seznam"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Izberite poxtne sezname, na katere se zxelite prijaviti"
+
+#~ msgid "No description given"
+#~ msgstr "Ni opisa"
+
+#~ msgid "Moderated:"
+#~ msgstr "Moderiran:"
+
+#~ msgid "Subscription:"
+#~ msgstr "Prijava:"
+
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "je "
+
+#~ msgid "p<get-var page />"
+#~ msgstr "str. <get-var page />"
diff --git a/slovene/po/partners.sl.po b/slovene/po/partners.sl.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/slovene/po/partners.sl.po
+++ b/slovene/po/partners.sl.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/slovene/po/stats.sl.po b/slovene/po/stats.sl.po
index 29be8c74e8e..4a6b88a6b6a 100644
--- a/slovene/po/stats.sl.po
+++ b/slovene/po/stats.sl.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/slovene/po/templates.sl.po b/slovene/po/templates.sl.po
index 194b1894e72..c795918b890 100644
--- a/slovene/po/templates.sl.po
+++ b/slovene/po/templates.sl.po
@@ -207,11 +207,11 @@ msgstr "v izdaji 2.2"
#. your language.
#: ../../english/template/debian/footer.wml:105
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
#: ../../english/template/debian/footer.wml:108
@@ -518,6 +518,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Opomba:</em> Izvorni dokument tega prevoda več ne obstaja."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -527,362 +531,362 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Nazaj na ostale <a href=\"./\">novice o Debian</a>."
-#~ msgid "More information"
-#~ msgstr "Več podatkov"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kmalu"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "povezava je verjetno zastarela"
-
-#~ msgid "When"
-#~ msgstr "Kdaj"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Obišcite&nbsp;pokrovitelja&nbsp;spletnega&nbsp;mesta"
-#~ msgid "Where"
-#~ msgstr "Kje"
+#~ msgid "Select a server near you"
+#~ msgstr "Izberite strežnik v svoji bližini"
-#~ msgid "More Info"
+#~ msgid "More information:"
#~ msgstr "Več podatkov"
-#~ msgid "Debian Involvement"
-#~ msgstr "Sodelovanje z Debianom"
-
-#~ msgid "Main Coordinator"
-#~ msgstr "Glavni koordinator"
+#~ msgid "Taken by:"
+#~ msgstr "Prevzel"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Koordinator</th><th>projekta</th>"
+#~ msgid "Nobody"
+#~ msgstr "Nihče"
-#~ msgid "Related Links"
-#~ msgstr "Sorodne povezave"
+#~ msgid "Rating:"
+#~ msgstr "Ocena"
-#~ msgid "Latest News"
-#~ msgstr "Najnovejše novice"
+#~ msgid "List of Consultants"
+#~ msgstr "Seznam svetovalcev"
-#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (mrtva povezava)"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
#, fuzzy
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
-#~ "seznam debian-news."
+#~ msgid "Download with Jigdo"
+#~ msgstr "prenesi z jigdom"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "prenesi s http/ftp"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "Network Install"
+#~ msgstr "namestitev z omrežja"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_faq\" />faq"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />razno"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_faq\" />faq"
#, fuzzy
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
-#~ "seznam debian-news."
-
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_misc\" />razno"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_misc\" />razno"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD team"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_on_cd"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Več podatkov"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />pogosta vprašanja"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "buy"
+#~ msgstr "buy"
+
+#~ msgid "net_install"
+#~ msgstr "net_install"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />razno"
#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Prizadeti paketi"
+#~ msgid "Nominations"
+#~ msgstr "Donacije"
#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid "Debate"
+#~ msgstr "Debian CD team"
#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Več podatkov"
+#~ msgid "Proposer"
+#~ msgstr "predlagano"
#, fuzzy
-#~ msgid "Discussion"
+#~ msgid "Minimum Discussion"
#~ msgstr "V&nbsp;diskusiji"
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "nič"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Čakamo&nbsp;na&nbsp;pokrovitelje"
-#~ msgid "pik"
-#~ msgstr "pik"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "V&nbsp;diskusiji"
-#~ msgid "download with pik"
-#~ msgstr "prenesi s pikom"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "V&nbsp;glasovanju"
-#~ msgid "buy pre-made images"
-#~ msgstr "kupi ???"
+#~ msgid "Decided"
+#~ msgstr "Odločeno"
-#~ msgid "network install"
-#~ msgstr "namestitev z omrežja"
+#~ msgid "Withdrawn"
+#~ msgstr "Umaknjeno"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Če se želite obrniti na nas, pojdite na <a href=\"m4_HOME/contact"
-#~ "\">kontaktno stran</a> za Debian."
+#~ msgid "Other"
+#~ msgstr "Drugo"
-#~ msgid "discussed"
-#~ msgstr "v diskusiji"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Domača&nbsp;glasovalna&nbsp;stran"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debianovo varnostno opozorilo"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kako..."
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debianova varnostna opozorila"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "podati&nbsp;predlog"
-#~ msgid "Date Reported"
-#~ msgstr "Dan prijave"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
-#~ msgid "Vulnerable"
-#~ msgstr "Ranljivo"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "spremljati&nbsp;predlog"
-#~ msgid "Fixed in"
-#~ msgstr "Popravljeno v"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "prebrati&nbsp;izide"
-#~ msgid "Source:"
-#~ msgstr "Izvor:"
+#~ msgid "Vote"
+#~ msgstr "glasovati"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arhitekturno neodvisna komponenta"
+#~ msgid "Security database references"
+#~ msgstr "Sklici iz varnostnih podatkovnih zbirk"
-#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
-#~ msgstr ""
-#~ "MD5 kontrolne vsote naštetih datotek so na voljo v <a href=\"<get-var "
-#~ "url />\">prvotnem opozorilu</a>."
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "V slovarju Mitre's CVE "
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih "
-#~ "zbirk."
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "V podatkovni zbirki Bugtraq (na SecurityFocusu)"
#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
#~ msgstr "CERTova poročila o ranljivosti, opozorila in poročila o incidentih"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "V podatkovni zbirki Bugtraq (na SecurityFocusu)"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih "
+#~ "zbirk."
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "V slovarju Mitre's CVE "
+#~ msgid ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
+#~ msgstr ""
+#~ "MD5 kontrolne vsote naštetih datotek so na voljo v <a href=\"<get-var "
+#~ "url />\">prvotnem opozorilu</a>."
-#~ msgid "Security database references"
-#~ msgstr "Sklici iz varnostnih podatkovnih zbirk"
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arhitekturno neodvisna komponenta"
-#~ msgid "Vote"
-#~ msgstr "glasovati"
+#~ msgid "Source:"
+#~ msgstr "Izvor:"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "prebrati&nbsp;izide"
+#~ msgid "Fixed in"
+#~ msgstr "Popravljeno v"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "spremljati&nbsp;predlog"
+#~ msgid "Vulnerable"
+#~ msgstr "Ranljivo"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
+#~ msgid "Date Reported"
+#~ msgstr "Dan prijave"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "podati&nbsp;predlog"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debianova varnostna opozorila"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kako..."
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debianovo varnostno opozorilo"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Domača&nbsp;glasovalna&nbsp;stran"
+#~ msgid "discussed"
+#~ msgstr "v diskusiji"
-#~ msgid "Other"
-#~ msgstr "Drugo"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Če se želite obrniti na nas, pojdite na <a href=\"m4_HOME/contact"
+#~ "\">kontaktno stran</a> za Debian."
-#~ msgid "Withdrawn"
-#~ msgstr "Umaknjeno"
+#~ msgid "network install"
+#~ msgstr "namestitev z omrežja"
-#~ msgid "Decided"
-#~ msgstr "Odločeno"
+#~ msgid "buy pre-made images"
+#~ msgstr "kupi ???"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "V&nbsp;glasovanju"
+#~ msgid "download with pik"
+#~ msgstr "prenesi s pikom"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "V&nbsp;diskusiji"
+#~ msgid "pik"
+#~ msgstr "pik"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Čakamo&nbsp;na&nbsp;pokrovitelje"
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "nič"
#, fuzzy
-#~ msgid "Minimum Discussion"
+#~ msgid "Discussion"
#~ msgstr "V&nbsp;diskusiji"
#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "predlagano"
+#~ msgid "License Information"
+#~ msgstr "Več podatkov"
#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debian CD team"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_misc\" />razno"
#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donacije"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />razno"
-
-#~ msgid "net_install"
-#~ msgstr "net_install"
-
-#~ msgid "buy"
-#~ msgstr "buy"
-
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
-
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "No Requested packages"
+#~ msgstr "Prizadeti paketi"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />pogosta vprašanja"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "Več podatkov"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_on_cd"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD team"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
+
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
+#~ "seznam debian-news."
#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "namestitev z omrežja"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "prenesi s http/ftp"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "prenesi z jigdom"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
+#~ "seznam debian-news."
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (mrtva povezava)"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#, fuzzy
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Seznam svetovalcev"
+#~ msgid "Latest News"
+#~ msgstr "Najnovejše novice"
-#~ msgid "Rating:"
-#~ msgstr "Ocena"
+#~ msgid "Related Links"
+#~ msgstr "Sorodne povezave"
-#~ msgid "Nobody"
-#~ msgstr "Nihče"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Koordinator</th><th>projekta</th>"
-#~ msgid "Taken by:"
-#~ msgstr "Prevzel"
+#~ msgid "Main Coordinator"
+#~ msgstr "Glavni koordinator"
-#~ msgid "More information:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Sodelovanje z Debianom"
+
+#~ msgid "More Info"
#~ msgstr "Več podatkov"
-#~ msgid "Select a server near you"
-#~ msgstr "Izberite strežnik v svoji bližini"
+#~ msgid "Where"
+#~ msgstr "Kje"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Obišcite&nbsp;pokrovitelja&nbsp;spletnega&nbsp;mesta"
+#~ msgid "When"
+#~ msgstr "Kdaj"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "povezava je verjetno zastarela"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kmalu"
+
+#~ msgid "More information"
+#~ msgstr "Več podatkov"
diff --git a/spanish/po/blends.es.po b/spanish/po/blends.es.po
index 2c6a2a42b87..51396c5370d 100644
--- a/spanish/po/blends.es.po
+++ b/spanish/po/blends.es.po
@@ -174,8 +174,8 @@ msgstr ""
"necesidades de los parlamentarios, políticos y sus asistentes en todo el "
"mundo."
-#~ msgid "Debian Accessibility"
-#~ msgstr "Debian Accesibilidad"
-
#~ msgid "Debian Games"
#~ msgstr "Juegos en Debian"
+
+#~ msgid "Debian Accessibility"
+#~ msgstr "Debian Accesibilidad"
diff --git a/spanish/po/bugs.es.po b/spanish/po/bugs.es.po
index 8f3780eda3a..8b68e1c7f34 100644
--- a/spanish/po/bugs.es.po
+++ b/spanish/po/bugs.es.po
@@ -160,152 +160,152 @@ msgstr "Archivados"
msgid "Archived and Unarchived"
msgstr "Archivados y desarchivados"
-#~ msgid "Exclude tag:"
-#~ msgstr "Excluir etiqueta:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Incluir etiqueta:"
+#~ msgid "Flags:"
+#~ msgstr "Opciones:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "fallos activos"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "mostrar fallos fusionados sólo una vez"
-#~ msgid "wontfix"
-#~ msgstr "wontfix (no se arreglará)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "no ordenar por estado o gravedad"
-#~ msgid "upstream"
-#~ msgstr "upstream (responsable autor original)"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "no mostrar la tabla de contenidos en la cabecera"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible (no reproducible)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "no mostrar las estadísticas en el pie de página"
-#~ msgid "security"
-#~ msgstr "security (seguridad)"
+#~ msgid "proposed-updates"
+#~ msgstr "actualizaciones_propuestas"
-#~ msgid "patch"
-#~ msgstr "patch (parche)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "actualizaciones_propuestas_para_pruebas"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo (más información)"
+#~ msgid "Package version:"
+#~ msgstr "Versión de paquete:"
-#~ msgid "l10n"
-#~ msgstr "l10n (internacionalización)"
+#~ msgid "Distribution:"
+#~ msgstr "Distribución:"
-#~ msgid "help"
-#~ msgstr "help (ayuda)"
+#~ msgid "bugs"
+#~ msgstr "fallos"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream (arreglado por el autor original)"
+#~ msgid "open"
+#~ msgstr "abierto"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental (arreglado en la distribución experimental)"
+#~ msgid "forwarded"
+#~ msgstr "reenviado"
-#~ msgid "d-i"
-#~ msgstr "d-i (instalador)"
+#~ msgid "pending"
+#~ msgstr "pendiente"
-#~ msgid "confirmed"
-#~ msgstr "confirmado"
+#~ msgid "fixed"
+#~ msgstr "arreglado"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "cerrado"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore (omitido para la publicación de lenny)"
+#~ msgid "Include status:"
+#~ msgstr "Estados a incluir:"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Estados a excluir:"
-#~ msgid "etch-ignore"
-#~ msgstr "ecth-ignore (omitido para la publicación de etch)"
+#~ msgid "critical"
+#~ msgstr "crítico"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "grave"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore (omitido para la publicación de sarge)"
+#~ msgid "serious"
+#~ msgstr "serio"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "importante"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "menor"
-#~ msgid "Exclude severity:"
-#~ msgstr "Gravedades a excluir:"
+#~ msgid "wishlist"
+#~ msgstr "deseo"
#~ msgid "Include severity:"
#~ msgstr "Gravedades a incluir:"
-#~ msgid "wishlist"
-#~ msgstr "deseo"
+#~ msgid "Exclude severity:"
+#~ msgstr "Gravedades a excluir:"
-#~ msgid "minor"
-#~ msgstr "menor"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "important"
-#~ msgstr "importante"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "serious"
-#~ msgstr "serio"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore (omitido para la publicación de sarge)"
-#~ msgid "grave"
-#~ msgstr "grave"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "critical"
-#~ msgstr "crítico"
+#~ msgid "etch-ignore"
+#~ msgstr "ecth-ignore (omitido para la publicación de etch)"
-#~ msgid "Exclude status:"
-#~ msgstr "Estados a excluir:"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "Include status:"
-#~ msgstr "Estados a incluir:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore (omitido para la publicación de lenny)"
-#~ msgid "done"
-#~ msgstr "cerrado"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "arreglado"
+#~ msgid "confirmed"
+#~ msgstr "confirmado"
-#~ msgid "pending"
-#~ msgstr "pendiente"
+#~ msgid "d-i"
+#~ msgstr "d-i (instalador)"
-#~ msgid "forwarded"
-#~ msgstr "reenviado"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental (arreglado en la distribución experimental)"
-#~ msgid "open"
-#~ msgstr "abierto"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream (arreglado por el autor original)"
-#~ msgid "bugs"
-#~ msgstr "fallos"
+#~ msgid "help"
+#~ msgstr "help (ayuda)"
-#~ msgid "Distribution:"
-#~ msgstr "Distribución:"
+#~ msgid "l10n"
+#~ msgstr "l10n (internacionalización)"
-#~ msgid "Package version:"
-#~ msgstr "Versión de paquete:"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo (más información)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "actualizaciones_propuestas_para_pruebas"
+#~ msgid "patch"
+#~ msgstr "patch (parche)"
-#~ msgid "proposed-updates"
-#~ msgstr "actualizaciones_propuestas"
+#~ msgid "security"
+#~ msgstr "security (seguridad)"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "no mostrar las estadísticas en el pie de página"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible (no reproducible)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "no mostrar la tabla de contenidos en la cabecera"
+#~ msgid "upstream"
+#~ msgstr "upstream (responsable autor original)"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "no ordenar por estado o gravedad"
+#~ msgid "wontfix"
+#~ msgstr "wontfix (no se arreglará)"
-#~ msgid "display merged bugs only once"
-#~ msgstr "mostrar fallos fusionados sólo una vez"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "fallos activos"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Opciones:"
+#~ msgid "Include tag:"
+#~ msgstr "Incluir etiqueta:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Excluir etiqueta:"
diff --git a/spanish/po/countries.es.po b/spanish/po/countries.es.po
index 4c4616f26fc..d4697a5bfd9 100644
--- a/spanish/po/countries.es.po
+++ b/spanish/po/countries.es.po
@@ -432,8 +432,8 @@ msgstr "Sudáfrica"
msgid "Zimbabwe"
msgstr "Zimbabue"
-#~ msgid "Yugoslavia"
-#~ msgstr "Yugoslavia"
-
#~ msgid "Great Britain"
#~ msgstr "Reino Unido"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Yugoslavia"
diff --git a/spanish/po/distrib.es.po b/spanish/po/distrib.es.po
index 24d4c0e7344..a79959c0f06 100644
--- a/spanish/po/distrib.es.po
+++ b/spanish/po/distrib.es.po
@@ -207,53 +207,53 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "Search case sensitive"
-#~ msgstr "Distinguir mayúsculas de minúsculas"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Permitir búsquedas dentro de palabras"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "yes"
-#~ msgstr "sí"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "no"
-#~ msgstr "no"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Case sensitive"
-#~ msgstr "Distinguir mayúsculas de minúsculas"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paquetes que contienen ficheros o directorios con ese nombre"
#~ msgid "all files in this package"
#~ msgstr "todos los ficheros en este paquete"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "paquetes que contienen ficheros o directorios con ese nombre"
+#~ msgid "Case sensitive"
+#~ msgstr "Distinguir mayúsculas de minúsculas"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "no"
+#~ msgstr "no"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "yes"
+#~ msgstr "sí"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Permitir búsquedas dentro de palabras"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "Search case sensitive"
+#~ msgstr "Distinguir mayúsculas de minúsculas"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "non-US"
+#~ msgstr "non-US"
diff --git a/spanish/po/doc.es.po b/spanish/po/doc.es.po
index 29b371c9d8b..4ecfd098654 100644
--- a/spanish/po/doc.es.po
+++ b/spanish/po/doc.es.po
@@ -232,13 +232,13 @@ msgstr "(versión <get-var version />)"
msgid "plain text"
msgstr "texto sin formato"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"El último código fuente <get-var srctype /> está disponible en el "
-"repositorio <a href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+"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
@@ -266,14 +266,6 @@ 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:178
-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:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -304,244 +296,117 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 arquitectura ARM "
-
-#~ msgid ""
-#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
-#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
-#~ "Psion5).\n"
-#~ " It also gives generic information, tools and techniques. The GNU\n"
-#~ " toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ " includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ " coming from other platforms.\n"
-#~ " It is not specific to Debian, but the Aleph\n"
-#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ " will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ " host machine too."
-#~ msgstr ""
-#~ "Este libro es para desarrolladores que trabajan con GNU/Linux en "
-#~ "procesadores ARM.\n"
-#~ "Cubre algunos dispositivos específicamente para instalación rápida(LART, "
-#~ "Assabet, Psion5).\n"
-#~ "También proporciona información genérica, herramientas y técnicas. La "
-#~ "cadena de herramientas\n"
-#~ "de GNU se cubre en forma nativa y multicompiladores, así como los "
-#~ "cargadores de arranque,\n"
-#~ "parches para el núcleo, RAMdisks, peculiaridades de ARM y otros recursos "
-#~ "para ARM. También\n"
-#~ "incluye guías con información extensa sobre lo básico de GNU/Linux para "
-#~ "desarrolladores\n"
-#~ "que vienen de otras plataformas.\n"
-#~ "No es específca de Debian, pero la distribución Aleph\n"
-#~ " ARMLinux está fuertemente basada en Debian-ARM y se asume que\n"
-#~ "se trabajará desde esta distribución y preferiblemente se dispone de una\n"
-#~ "máquina anfitriona también con Debian. "
-
-#~ msgid "Latest version in development:"
-#~ msgstr "Última versión de desarrollo:"
-
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Use <a href=\"cvs\">SVN</a> para descargar el texto de las fuentes SGML "
-#~ "de <get-var ddp_pkg_loc />."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "CD Sarge con instalador y una selección de paquetes"
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "Una <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publicación</a> alternativa está disponible en Lehmanns "
-#~ "Fachbuchhandlung y cuesta 29.95\n"
-#~ " euros (en 2008)."
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "CD «Live» con Knoppix"
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Este es el libro correcto para aprender cómo crear plataformas de TI "
-#~ "básicas y complejas usando solamente software libre. En él encontrará una "
-#~ "amplia gama de procedimientos revisados y ajustados para encajar en las "
-#~ "mejores prácticas de la implementación de infraestructura tecnológica. "
-#~ "Esta guía completa y fácil de leer le llevará de la mano para conseguir "
-#~ "objetivos específicos con el sistema operativo Debian GNU/Linux."
+#~ "Los principiantes y usuarios avanzados encontrarán en este libro una\n"
+#~ "fuente de información completa sobre el uso de Debian en escritorios,\n"
+#~ "servidores de intranet, internet y desarrollo. También contiene\n"
+#~ "información de contexto sobre el proyecto y una cobertura extensiva\n"
+#~ "del sistema de gestión de paquetes único de Debian."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Este libro se divide en cuatro partes: conceptos básicos, gestión de\n"
-#~ "GNU/Linux, administración del sistema y operaciones avanzadas. Cada "
-#~ "capítulo\n"
-#~ "explica en profundidad las características del sistema operativo. Los "
-#~ "primeros\n"
-#~ "capítulos explican la estructura de GNU/Linux. Estos capítulos ayudarán\n"
-#~ "al lector a entender cómo el sistema usa los recursos básicos como el\n"
-#~ "procesador y la memoria. Un análisis detallado sobre sistemas de archivo "
-#~ "como\n"
-#~ "Ext2, Ext3 y ReiserFS permitirá a los usuarios hacer la elección "
-#~ "correcta\n"
-#~ "para sus necesidades. Muchas gráficas a través del libro muestran "
-#~ "aspectos acerca de\n"
-#~ "el rendimiento del sistema. Este libro se ofrece para estudiantes de "
-#~ "universidad\n"
-#~ "y cualquiera que quiera aprender GNU/Linux en profundidad. Este libro "
-#~ "cubre\n"
-#~ "Debian Sarge."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "Debian GNU/Linux 3.1r0a \"sarge\" oficial en DVD (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "El primer libro persa sobre Debian GNU/Linux. Este libro le ayuda a\n"
-#~ "instalar Debian GNU/Linux e instalar servicios de red como web,\n"
-#~ "base de datos, cortafuegos, correo, ftp y.... más. También le ayuda a "
-#~ "empezar\n"
-#~ "a usar GNU/Linux y el potente sistema de gestión de paquetes de Debian."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Este libro introduce los conceptos y técnicas del sistema operativo\n"
+#~ "Debian, explicando sus usos y escollos, y\n"
+#~ "ilustrando el razonamiento existente tras cada uno de los enfoques. El "
+#~ "objetivo\n"
+#~ "no es ser un libro de referencia, sino iluminar al usuario sobre\n"
+#~ "cómo funciona el proyecto y el sistema operativo para aprender y\n"
+#~ "abrazar las soluciones sofisticadas y elegantes, a veces a primera vista\n"
+#~ "no intuitivas, que han evolucionado como parte del sistema operativo\n"
+#~ "Debian en la última década. Aunque el objetivo es el administrador\n"
+#~ "UNIX/Linux bien versado, el libro puede servir también como un excelente\n"
+#~ "recurso como una referencia estándar sobre Linux para arrancar\n"
+#~ "la experiencia Linux en una filosofía de abajo a arriba en Debian."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Este libro presenta Debian GNU/Linux a los lectores mediante muchas\n"
-#~ "guía paso a paso y consejos. Escrito en coreano, este libro cubre\n"
-#~ "aspectos completos del sistema Debian GNU/Linux: instalación por primera "
-#~ "vez,\n"
-#~ "instalación de paquetes, instalación de X, conexión a Internet, "
-#~ "mantenimiento\n"
-#~ "de la red, y más. Este libro proporciona un montón de consejos sobre "
-#~ "cómo\n"
-#~ "instalar Debian para un entorno de trabajo en idioma coreano, y es bueno "
-#~ "también para los principiantes."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Tres CDs oficiales de potato r3 y un CD no oficial de woody"
+#~ "Una guía de referencia y manual para el sistema Debian GNU/Linux que "
+#~ "muestra,\n"
+#~ "en más de 1.500 <q>recetas</q>, cómo usarlo para las actividades diarias "
+#~ "- desde\n"
+#~ "trabajar con texto, imágenes y sonido a asuntos de productividad y "
+#~ "conectividad.\n"
+#~ "Como el software que describe el libro, el libro está liberado\n"
+#~ "y las fuentes están disponibles."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Este libro proporciona una guía breve de la instalación de Debian\n"
-#~ "GNU/Linux, aspectos esenciales de las órdenes de Unix y Linux, "
-#~ "configuración básica y\n"
-#~ "mantenimiento del sistema y la red,\n"
-#~ "instalación del sistema de ventanas X, y usar multimedia en Debian GNU/"
-#~ "Linux.\n"
-#~ "Este libro también incluye una guía para mantenedores, que motiva\n"
-#~ "a la gente en Corea a ser mantenedores de Debian."
+#~ "Aprendiendo Debian GNU/Linux guía al nuevo usuario de Linux a través de\n"
+#~ "la instalación y configuración de Debian GNU/Linux.\n"
+#~ "Los usuarios de Windows obtienen una introducción elegante a este\n"
+#~ "excitante mundo de la computación, guiada por Bill McCarty en "
+#~ "<q>Aprendiendo Debian GNU/Linux</q>."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 Woody no oficial, 3 Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Este libro cubre aspectos generales sobre Debian GNU/Linux:\n"
-#~ "instalación, APT y dpkg, la shell, el sistema de ventanas X, redes, "
-#~ "administración\n"
-#~ "de sistemas, instalación del núcleo, compartición con Windows, "
-#~ "construcción de servidores\n"
-#~ "y más.\n"
-#~ "Podrá instalar y comenzar a usar Debian GNU/Linux en un entorno en "
-#~ "japonés\n"
-#~ "de manera muy sencilla con los CDs personalizados."
+#~ "Incluye más de 230 páginas y tres discos CD-ROM. Los temas que cubre el "
+#~ "software\n"
+#~ "incluyen Debian Linux, redes, herramientas de programación, interfaz "
+#~ "gráfica, publicación\n"
+#~ "en el escritorio, negocios, cosas divertidas, y multimedia. 30 días de "
+#~ "soporte de correo\n"
+#~ "electrónico gratuito incluidos."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 edición del autor (3 CDs)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Este es el último libro de Sarge de la serie que se ha\n"
-#~ "soportado como una biblia estándar sobre Debian en Japón.\n"
-#~ "Este libro cubre todos los aspectos del uso de Debian GNU/Linux 3.1 "
-#~ "Sarge, como\n"
-#~ "la instalación, entornos de escritorio, administración del sistema, y\n"
-#~ "configuración de servidor. Más aún, este libro también incluye un "
-#~ "paquete\n"
-#~ "de tipo de letra comercial para decorar su escritorio. Este libro puede "
-#~ "resultar útil\n"
-#~ "para todos los usuarios de Debian, desde principiantes hasta usuarios "
-#~ "avanzados."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "dos ediciones: una sin DVD, la otra con 2 DVDs (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr ""
-#~ "Debian GNU/Linux 3.1r0 i386, edición del autor (DVD +\n"
-#~ " CD)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi arquitectura (i386 y amd64) en DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Este libro tiene un estilo de diccionario y cubre varios consejos para "
-#~ "principiantes\n"
-#~ "y usuarios con conocimientos intermedios; instalación de distintas "
-#~ "maneras,\n"
-#~ "personalización del escritorio, resolución de problemas, conocimiento "
-#~ "aprovechable y más."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "instalador Debian GNU/Linux 3.1 Sarge (CD de una sola cara)"
+#~ "dos ediciones: una sin CD, la otra con el CD oficial (i386, contrib y "
+#~ "fuentes)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -577,114 +442,248 @@ msgstr "PDF"
#~ "como planificación y construcción de un enrutador de llamadas o\n"
#~ "un servidor para clientes basados en Windows (Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "instalador Debian GNU/Linux 3.1 Sarge (CD de una sola cara)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "dos ediciones: una sin CD, la otra con el CD oficial (i386, contrib y "
-#~ "fuentes)"
+#~ "Este libro tiene un estilo de diccionario y cubre varios consejos para "
+#~ "principiantes\n"
+#~ "y usuarios con conocimientos intermedios; instalación de distintas "
+#~ "maneras,\n"
+#~ "personalización del escritorio, resolución de problemas, conocimiento "
+#~ "aprovechable y más."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi arquitectura (i386 y amd64) en DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr ""
+#~ "Debian GNU/Linux 3.1r0 i386, edición del autor (DVD +\n"
+#~ " CD)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "dos ediciones: una sin DVD, la otra con 2 DVDs (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Este es el último libro de Sarge de la serie que se ha\n"
+#~ "soportado como una biblia estándar sobre Debian en Japón.\n"
+#~ "Este libro cubre todos los aspectos del uso de Debian GNU/Linux 3.1 "
+#~ "Sarge, como\n"
+#~ "la instalación, entornos de escritorio, administración del sistema, y\n"
+#~ "configuración de servidor. Más aún, este libro también incluye un "
+#~ "paquete\n"
+#~ "de tipo de letra comercial para decorar su escritorio. Este libro puede "
+#~ "resultar útil\n"
+#~ "para todos los usuarios de Debian, desde principiantes hasta usuarios "
+#~ "avanzados."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 edición del autor (3 CDs)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Incluye más de 230 páginas y tres discos CD-ROM. Los temas que cubre el "
-#~ "software\n"
-#~ "incluyen Debian Linux, redes, herramientas de programación, interfaz "
-#~ "gráfica, publicación\n"
-#~ "en el escritorio, negocios, cosas divertidas, y multimedia. 30 días de "
-#~ "soporte de correo\n"
-#~ "electrónico gratuito incluidos."
+#~ "Este libro cubre aspectos generales sobre Debian GNU/Linux:\n"
+#~ "instalación, APT y dpkg, la shell, el sistema de ventanas X, redes, "
+#~ "administración\n"
+#~ "de sistemas, instalación del núcleo, compartición con Windows, "
+#~ "construcción de servidores\n"
+#~ "y más.\n"
+#~ "Podrá instalar y comenzar a usar Debian GNU/Linux en un entorno en "
+#~ "japonés\n"
+#~ "de manera muy sencilla con los CDs personalizados."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 Woody no oficial, 3 Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "Aprendiendo Debian GNU/Linux guía al nuevo usuario de Linux a través de\n"
-#~ "la instalación y configuración de Debian GNU/Linux.\n"
-#~ "Los usuarios de Windows obtienen una introducción elegante a este\n"
-#~ "excitante mundo de la computación, guiada por Bill McCarty en "
-#~ "<q>Aprendiendo Debian GNU/Linux</q>."
+#~ "Este libro proporciona una guía breve de la instalación de Debian\n"
+#~ "GNU/Linux, aspectos esenciales de las órdenes de Unix y Linux, "
+#~ "configuración básica y\n"
+#~ "mantenimiento del sistema y la red,\n"
+#~ "instalación del sistema de ventanas X, y usar multimedia en Debian GNU/"
+#~ "Linux.\n"
+#~ "Este libro también incluye una guía para mantenedores, que motiva\n"
+#~ "a la gente en Corea a ser mantenedores de Debian."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Tres CDs oficiales de potato r3 y un CD no oficial de woody"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "Una guía de referencia y manual para el sistema Debian GNU/Linux que "
-#~ "muestra,\n"
-#~ "en más de 1.500 <q>recetas</q>, cómo usarlo para las actividades diarias "
-#~ "- desde\n"
-#~ "trabajar con texto, imágenes y sonido a asuntos de productividad y "
-#~ "conectividad.\n"
-#~ "Como el software que describe el libro, el libro está liberado\n"
-#~ "y las fuentes están disponibles."
+#~ "Este libro presenta Debian GNU/Linux a los lectores mediante muchas\n"
+#~ "guía paso a paso y consejos. Escrito en coreano, este libro cubre\n"
+#~ "aspectos completos del sistema Debian GNU/Linux: instalación por primera "
+#~ "vez,\n"
+#~ "instalación de paquetes, instalación de X, conexión a Internet, "
+#~ "mantenimiento\n"
+#~ "de la red, y más. Este libro proporciona un montón de consejos sobre "
+#~ "cómo\n"
+#~ "instalar Debian para un entorno de trabajo en idioma coreano, y es bueno "
+#~ "también para los principiantes."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Este libro introduce los conceptos y técnicas del sistema operativo\n"
-#~ "Debian, explicando sus usos y escollos, y\n"
-#~ "ilustrando el razonamiento existente tras cada uno de los enfoques. El "
-#~ "objetivo\n"
-#~ "no es ser un libro de referencia, sino iluminar al usuario sobre\n"
-#~ "cómo funciona el proyecto y el sistema operativo para aprender y\n"
-#~ "abrazar las soluciones sofisticadas y elegantes, a veces a primera vista\n"
-#~ "no intuitivas, que han evolucionado como parte del sistema operativo\n"
-#~ "Debian en la última década. Aunque el objetivo es el administrador\n"
-#~ "UNIX/Linux bien versado, el libro puede servir también como un excelente\n"
-#~ "recurso como una referencia estándar sobre Linux para arrancar\n"
-#~ "la experiencia Linux en una filosofía de abajo a arriba en Debian."
+#~ "El primer libro persa sobre Debian GNU/Linux. Este libro le ayuda a\n"
+#~ "instalar Debian GNU/Linux e instalar servicios de red como web,\n"
+#~ "base de datos, cortafuegos, correo, ftp y.... más. También le ayuda a "
+#~ "empezar\n"
+#~ "a usar GNU/Linux y el potente sistema de gestión de paquetes de Debian."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "Debian GNU/Linux 3.1r0a \"sarge\" oficial en DVD (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Este libro se divide en cuatro partes: conceptos básicos, gestión de\n"
+#~ "GNU/Linux, administración del sistema y operaciones avanzadas. Cada "
+#~ "capítulo\n"
+#~ "explica en profundidad las características del sistema operativo. Los "
+#~ "primeros\n"
+#~ "capítulos explican la estructura de GNU/Linux. Estos capítulos ayudarán\n"
+#~ "al lector a entender cómo el sistema usa los recursos básicos como el\n"
+#~ "procesador y la memoria. Un análisis detallado sobre sistemas de archivo "
+#~ "como\n"
+#~ "Ext2, Ext3 y ReiserFS permitirá a los usuarios hacer la elección "
+#~ "correcta\n"
+#~ "para sus necesidades. Muchas gráficas a través del libro muestran "
+#~ "aspectos acerca de\n"
+#~ "el rendimiento del sistema. Este libro se ofrece para estudiantes de "
+#~ "universidad\n"
+#~ "y cualquiera que quiera aprender GNU/Linux en profundidad. Este libro "
+#~ "cubre\n"
+#~ "Debian Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Los principiantes y usuarios avanzados encontrarán en este libro una\n"
-#~ "fuente de información completa sobre el uso de Debian en escritorios,\n"
-#~ "servidores de intranet, internet y desarrollo. También contiene\n"
-#~ "información de contexto sobre el proyecto y una cobertura extensiva\n"
-#~ "del sistema de gestión de paquetes único de Debian."
+#~ "Este es el libro correcto para aprender cómo crear plataformas de TI "
+#~ "básicas y complejas usando solamente software libre. En él encontrará una "
+#~ "amplia gama de procedimientos revisados y ajustados para encajar en las "
+#~ "mejores prácticas de la implementación de infraestructura tecnológica. "
+#~ "Esta guía completa y fácil de leer le llevará de la mano para conseguir "
+#~ "objetivos específicos con el sistema operativo Debian GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "CD «Live» con Knoppix"
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Una <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publicación</a> alternativa está disponible en Lehmanns "
+#~ "Fachbuchhandlung y cuesta 29.95\n"
+#~ " euros (en 2008)."
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "CD Sarge con instalador y una selección de paquetes"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Use <a href=\"cvs\">SVN</a> para descargar el texto de las fuentes SGML "
+#~ "de <get-var ddp_pkg_loc />."
+
+#~ msgid "Language:"
+#~ msgstr "Idioma:"
+
+#~ msgid "Latest version in development:"
+#~ msgstr "Última versión de desarrollo:"
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Este libro es para desarrolladores que trabajan con GNU/Linux en "
+#~ "procesadores ARM.\n"
+#~ "Cubre algunos dispositivos específicamente para instalación rápida(LART, "
+#~ "Assabet, Psion5).\n"
+#~ "También proporciona información genérica, herramientas y técnicas. La "
+#~ "cadena de herramientas\n"
+#~ "de GNU se cubre en forma nativa y multicompiladores, así como los "
+#~ "cargadores de arranque,\n"
+#~ "parches para el núcleo, RAMdisks, peculiaridades de ARM y otros recursos "
+#~ "para ARM. También\n"
+#~ "incluye guías con información extensa sobre lo básico de GNU/Linux para "
+#~ "desarrolladores\n"
+#~ "que vienen de otras plataformas.\n"
+#~ "No es específca de Debian, pero la distribución Aleph\n"
+#~ " ARMLinux está fuertemente basada en Debian-ARM y se asume que\n"
+#~ "se trabajará desde esta distribución y preferiblemente se dispone de una\n"
+#~ "máquina anfitriona también con Debian. "
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 arquitectura ARM "
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "El último código fuente <get-var srctype /> está disponible en el "
+#~ "repositorio <a href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
diff --git a/spanish/po/l10n.es.po b/spanish/po/l10n.es.po
index 6c061ffe5ae..70f6a92f0f4 100644
--- a/spanish/po/l10n.es.po
+++ b/spanish/po/l10n.es.po
@@ -93,11 +93,11 @@ msgstr "Ficheros POT"
msgid "Hints for translators"
msgstr "Consejos para traductores"
-#~ msgid "Todo"
-#~ msgstr "Por hacer"
+#~ msgid "Original templates"
+#~ msgstr "Plantillas originales"
#~ msgid "Translated templates"
#~ msgstr "Plantillas traducidas"
-#~ msgid "Original templates"
-#~ msgstr "Plantillas originales"
+#~ msgid "Todo"
+#~ msgstr "Por hacer"
diff --git a/spanish/po/mailinglists.es.po b/spanish/po/mailinglists.es.po
index ec67139b275..e0d1e2c9d3e 100644
--- a/spanish/po/mailinglists.es.po
+++ b/spanish/po/mailinglists.es.po
@@ -137,8 +137,8 @@ msgstr "abierta"
msgid "closed"
msgstr "cerrada"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Por favor, seleccione las listas de las que quiere darse de baja:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Por favor, seleccione a qué listas quiere suscribirse:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Por favor, seleccione las listas de las que quiere darse de baja:"
diff --git a/spanish/po/organization.es.po b/spanish/po/organization.es.po
index 58dd5f62eab..54f4f2554f0 100644
--- a/spanish/po/organization.es.po
+++ b/spanish/po/organization.es.po
@@ -397,54 +397,69 @@ msgstr "Debian para la ciencia e investigación relacionada"
msgid "Debian for astronomy"
msgstr "Debian para la astronomía"
-#~ msgid "Auditor"
-#~ msgstr "Auditor"
+#~ msgid "Volatile Team"
+#~ msgstr "Equipo responsable de «volatile»"
-#~ msgid "Live System Team"
-#~ msgstr "Equipo del sistema de instalación «live»"
+#~ msgid "Vendors"
+#~ msgstr "Vendedores"
-#~ msgid "Publicity"
-#~ msgstr "Publicidad"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribuciones Debian Derivadas"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Grupo de gestión del anillo de claves de los desarrolladores Debian"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Equipo responsable de la publicación de «estable»"
-#~ msgid "DebConf chairs"
-#~ msgstr "organizadores de Debconf"
+#~ msgid "APT Team"
+#~ msgstr "Equipo de APT"
-#~ msgid "Bits from Debian"
-#~ msgstr "Bits de Debian"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Puede contactar con los administadores responsables para los buildd de "
+#~ "una arquitectura específica en la dirección <genericemail arch@buildd."
+#~ "debian.org>. Por ejemplo: <genericemail i386@buildd.debian.org>."
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Líder del Proyecto Debian actual"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Puede encontrar los nombres de los administradores de un buildd "
+#~ "particular en <a href=\"http://www.buildd.net\">http://www.buildd.net</"
+#~ "a>. Escoja una arquitectura y distribución para ver la lista de máquinas "
+#~ "buildd disponibles y sus administradores."
-#~ msgid "Testing Security Team"
-#~ msgstr "Equipo de seguridad de la distribución «en pruebas»"
+#~ msgid "Accountant"
+#~ msgstr "Contabilidad"
-#~ msgid "Security Audit Project"
-#~ msgstr "Proyecto de auditoría de seguridad"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "El sistema operativo universal como su escritorio"
-#~ msgid "Handhelds"
-#~ msgstr "Agendas electrónicas y similares"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian para asociaciones sin ánimo de lucro"
-#~ msgid "Marketing Team"
-#~ msgstr "Equipo de marketing"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Sistema de instalación de la versión «estable»"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordinación de firma de claves"
+#~ msgid "Internal Projects"
+#~ msgstr "Proyectos internos"
-#~ msgid "Release Assistants"
-#~ msgstr "Asistentes a la publicación de versiones"
+#~ msgid "Mailing list"
+#~ msgstr "Lista de correo"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Asistentes a la publicación de «estable»"
+#~ msgid "Installation"
+#~ msgstr "Instalación"
-# JFS: Seguramente haya una mejor traducción...
-#~ msgid "Release Wizard"
-#~ msgstr "Mago de la publicación"
+#~ msgid "Delegates"
+#~ msgstr "Delegados"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribución multimedia Debian"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux para el cómputo empresarial"
+
+#~ msgid "Mailing List Archives"
+#~ msgstr "Archivos de las listas de correo"
#~ msgid ""
#~ "This is not yet an official Debian internal project but it has announced "
@@ -453,66 +468,51 @@ msgstr "Debian para la astronomía"
#~ "Éste no es aún un proyecto interno oficial de Debian pero ha anunciado su "
#~ "intención de integrarse."
-#~ msgid "Mailing List Archives"
-#~ msgstr "Archivos de las listas de correo"
-
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux para el cómputo empresarial"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribución multimedia Debian"
-#~ msgid "Delegates"
-#~ msgstr "Delegados"
+# JFS: Seguramente haya una mejor traducción...
+#~ msgid "Release Wizard"
+#~ msgstr "Mago de la publicación"
-#~ msgid "Installation"
-#~ msgstr "Instalación"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Asistentes a la publicación de «estable»"
-#~ msgid "Mailing list"
-#~ msgstr "Lista de correo"
+#~ msgid "Release Assistants"
+#~ msgstr "Asistentes a la publicación de versiones"
-#~ msgid "Internal Projects"
-#~ msgstr "Proyectos internos"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordinación de firma de claves"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Sistema de instalación de la versión «estable»"
+#~ msgid "Marketing Team"
+#~ msgstr "Equipo de marketing"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian para asociaciones sin ánimo de lucro"
+#~ msgid "Handhelds"
+#~ msgstr "Agendas electrónicas y similares"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "El sistema operativo universal como su escritorio"
+#~ msgid "Security Audit Project"
+#~ msgstr "Proyecto de auditoría de seguridad"
-#~ msgid "Accountant"
-#~ msgstr "Contabilidad"
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipo de seguridad de la distribución «en pruebas»"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Puede encontrar los nombres de los administradores de un buildd "
-#~ "particular en <a href=\"http://www.buildd.net\">http://www.buildd.net</"
-#~ "a>. Escoja una arquitectura y distribución para ver la lista de máquinas "
-#~ "buildd disponibles y sus administradores."
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Líder del Proyecto Debian actual"
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Puede contactar con los administadores responsables para los buildd de "
-#~ "una arquitectura específica en la dirección <genericemail arch@buildd."
-#~ "debian.org>. Por ejemplo: <genericemail i386@buildd.debian.org>."
+#~ msgid "Bits from Debian"
+#~ msgstr "Bits de Debian"
-#~ msgid "APT Team"
-#~ msgstr "Equipo de APT"
+#~ msgid "DebConf chairs"
+#~ msgstr "organizadores de Debconf"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Equipo responsable de la publicación de «estable»"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Grupo de gestión del anillo de claves de los desarrolladores Debian"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribuciones Debian Derivadas"
+#~ msgid "Publicity"
+#~ msgstr "Publicidad"
-#~ msgid "Vendors"
-#~ msgstr "Vendedores"
+#~ msgid "Live System Team"
+#~ msgstr "Equipo del sistema de instalación «live»"
-#~ msgid "Volatile Team"
-#~ msgstr "Equipo responsable de «volatile»"
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
diff --git a/spanish/po/others.es.po b/spanish/po/others.es.po
index 66d1d5b9421..61c0fca188b 100644
--- a/spanish/po/others.es.po
+++ b/spanish/po/others.es.po
@@ -332,116 +332,96 @@ msgstr "Versión"
msgid "URL"
msgstr "URL"
-#~ msgid "Wanted:"
-#~ msgstr "Deseado:"
-
-#~ msgid "Who:"
-#~ msgstr "Quién:"
+#~ msgid "p<get-var page />"
+#~ msgstr "pág.<get-var page />"
-#~ msgid "Architecture:"
-#~ msgstr "Arquitectura"
+#~ msgid "Previous Talks:"
+#~ msgstr "Conferencias previas:"
-#~ msgid "Specifications:"
-#~ msgstr "Especificaciones:"
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
-#~ msgid "Where:"
-#~ msgstr "Dónde:"
+#~ msgid "Location:"
+#~ msgstr "Localización:"
-#~ msgid "Name:"
-#~ msgstr "Nombre:"
+#~ msgid "Topics:"
+#~ msgstr "Temas:"
-#~ msgid "Company:"
-#~ msgstr "Compañía:"
+#~ msgid "rc3 (broken)"
+#~ msgstr "rc3 (roto)"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "rc3"
+#~ msgstr "rc3"
-#~ msgid "or"
-#~ msgstr "o"
+#~ msgid "rc2"
+#~ msgstr "rc2"
-#~ msgid "Email:"
-#~ msgstr "Correo electrónico:"
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
+#~ msgstr "Debian GNU/Linux: Tu próxima distribución de Linux."
-#~ msgid "Rates:"
-#~ msgstr "Tarifas:"
+#~ msgid "Debian: The Perfect OS"
+#~ msgstr "Debian: El S.O perfecto."
-#~ msgid "Willing to Relocate"
-#~ msgstr "Sin localización definida"
+#~ msgid "Debian: The biggest is still the best."
+#~ msgstr "Debian: Lo más grande aún es lo mejor."
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> consultores de Debian en total en <total_country> "
-#~ "países por todo el mundo."
+#~ msgid "Older Debian banners"
+#~ msgstr "Pancartas de Debian antiguas"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Suscripción a las listas de correo"
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: la patata ha aterrizado. Anunciando la versión 2.2"
-#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
-#~ msgstr ""
-#~ "Vea la página de las <a href=\"./#subunsub\">listas de correo</a> para "
-#~ "tener información sobre cómo suscribirse usando el correo electrónico. "
-#~ "También hay disponible un <a href=\"unsubscribe\">formulario web de "
-#~ "desuscripción</a>, para darse de baja de las listas de correo. "
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get'étate dentro de ella."
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Tenga en cuenta que la mayoría de las listas de correo de Debian son "
-#~ "foros públicos. Cualquier correo enviado a las listas se publicará en los "
-#~ "archivos de las listas de correo y será indexado por motores de búsqueda. "
-#~ "Sólo debería suscribirse a las listas de correo de Debian con una "
-#~ "dirección de correo que no le importa que se haga pública."
+#~ msgid "Newer Debian banners"
+#~ msgstr "Nuevas pancartas de Debian"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Por favor, seleccione a qué listas quiere suscribirse:"
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "cartel&nbsp;GIF&nbsp;animado"
-#~ msgid "No description given"
-#~ msgstr "Sin descripción."
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "cartel&nbsp;horizontal"
-#~ msgid "Moderated:"
-#~ msgstr "Moderada:"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "cartel&nbsp;vertical"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "El envío de mensajes sólo está permitido a los suscritos."
+#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
+#~ msgstr ""
+#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">más información</a>)"
#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">more info</a>)"
#~ msgstr ""
-#~ "Sólo se aceptarán mensajes a esta lista si están firmados por un "
-#~ "desarrollador de Debian."
+#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">más "
+#~ "información</a>)"
-#~ msgid "Subscription:"
-#~ msgstr "Suscripción:"
+#~ msgid "Q"
+#~ msgstr "P"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "es una versión resumida, de sólo lectura."
+#~ msgid "developers only"
+#~ msgstr "sólo desarrolladores"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Su dirección de correo:"
+#~ msgid "deity developers only"
+#~ msgstr "sólo desarrolladores de deity"
-#~ msgid "Subscribe"
-#~ msgstr "Enviar suscripción"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "sólo Comité Técnico de Debian"
-#~ msgid "Clear"
-#~ msgstr "Borrar selección"
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr ""
-#~ " Por favor, respete la <a href=\"./#ads\">política de publicidad en las "
-#~ "listas de correo de Debian</a>. "
+#~ msgid "closed"
+#~ msgstr "cerrada"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Desuscripción de las listas de correo"
+#~ msgid "open"
+#~ msgstr "abierta"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Enviar desuscripción"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Por favor, seleccione las listas de las que quiere darse de baja:"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -453,93 +433,113 @@ msgstr "URL"
#~ "También hay disponible un <a href=\"subscribe\">formulario web de "
#~ "suscripción</a>, para suscribirse a las listas de correo. "
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Por favor, seleccione las listas de las que quiere darse de baja:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Enviar desuscripción"
-
-#~ msgid "open"
-#~ msgstr "abierta"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Desuscripción de las listas de correo"
-#~ msgid "closed"
-#~ msgstr "cerrada"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr ""
+#~ " Por favor, respete la <a href=\"./#ads\">política de publicidad en las "
+#~ "listas de correo de Debian</a>. "
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
+#~ msgid "Clear"
+#~ msgstr "Borrar selección"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "sólo Comité Técnico de Debian"
+#~ msgid "Subscribe"
+#~ msgstr "Enviar suscripción"
-#~ msgid "deity developers only"
-#~ msgstr "sólo desarrolladores de deity"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Su dirección de correo:"
-#~ msgid "developers only"
-#~ msgstr "sólo desarrolladores"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "es una versión resumida, de sólo lectura."
-#~ msgid "Q"
-#~ msgstr "P"
+#~ msgid "Subscription:"
+#~ msgstr "Suscripción:"
#~ msgid ""
-#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">more info</a>)"
+#~ "Only messages signed by a Debian developer will be accepted by this list."
#~ msgstr ""
-#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">más "
-#~ "información</a>)"
+#~ "Sólo se aceptarán mensajes a esta lista si están firmados por un "
+#~ "desarrollador de Debian."
-#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
-#~ msgstr ""
-#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">más información</a>)"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "El envío de mensajes sólo está permitido a los suscritos."
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "cartel&nbsp;vertical"
+#~ msgid "Moderated:"
+#~ msgstr "Moderada:"
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "cartel&nbsp;horizontal"
+#~ msgid "No description given"
+#~ msgstr "Sin descripción."
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "cartel&nbsp;GIF&nbsp;animado"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Por favor, seleccione a qué listas quiere suscribirse:"
-#~ msgid "Newer Debian banners"
-#~ msgstr "Nuevas pancartas de Debian"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "Tenga en cuenta que la mayoría de las listas de correo de Debian son "
+#~ "foros públicos. Cualquier correo enviado a las listas se publicará en los "
+#~ "archivos de las listas de correo y será indexado por motores de búsqueda. "
+#~ "Sólo debería suscribirse a las listas de correo de Debian con una "
+#~ "dirección de correo que no le importa que se haga pública."
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get'étate dentro de ella."
+#~ msgid ""
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ msgstr ""
+#~ "Vea la página de las <a href=\"./#subunsub\">listas de correo</a> para "
+#~ "tener información sobre cómo suscribirse usando el correo electrónico. "
+#~ "También hay disponible un <a href=\"unsubscribe\">formulario web de "
+#~ "desuscripción</a>, para darse de baja de las listas de correo. "
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: la patata ha aterrizado. Anunciando la versión 2.2"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Suscripción a las listas de correo"
-#~ msgid "Older Debian banners"
-#~ msgstr "Pancartas de Debian antiguas"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> consultores de Debian en total en <total_country> "
+#~ "países por todo el mundo."
-#~ msgid "Debian: The biggest is still the best."
-#~ msgstr "Debian: Lo más grande aún es lo mejor."
+#~ msgid "Willing to Relocate"
+#~ msgstr "Sin localización definida"
-#~ msgid "Debian: The Perfect OS"
-#~ msgstr "Debian: El S.O perfecto."
+#~ msgid "Rates:"
+#~ msgstr "Tarifas:"
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
-#~ msgstr "Debian GNU/Linux: Tu próxima distribución de Linux."
+#~ msgid "Email:"
+#~ msgstr "Correo electrónico:"
-#~ msgid "rc2"
-#~ msgstr "rc2"
+#~ msgid "or"
+#~ msgstr "o"
-#~ msgid "rc3"
-#~ msgstr "rc3"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "rc3 (broken)"
-#~ msgstr "rc3 (roto)"
+#~ msgid "Company:"
+#~ msgstr "Compañía:"
-#~ msgid "Topics:"
-#~ msgstr "Temas:"
+#~ msgid "Name:"
+#~ msgstr "Nombre:"
-#~ msgid "Location:"
-#~ msgstr "Localización:"
+#~ msgid "Where:"
+#~ msgstr "Dónde:"
-#~ msgid "Languages:"
-#~ msgstr "Idiomas:"
+#~ msgid "Specifications:"
+#~ msgstr "Especificaciones:"
-#~ msgid "Previous Talks:"
-#~ msgstr "Conferencias previas:"
+#~ msgid "Architecture:"
+#~ msgstr "Arquitectura"
-#~ msgid "p<get-var page />"
-#~ msgstr "pág.<get-var page />"
+#~ msgid "Who:"
+#~ msgstr "Quién:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Deseado:"
diff --git a/spanish/po/partners.es.po b/spanish/po/partners.es.po
index 271f9d9c920..d79813d4d19 100644
--- a/spanish/po/partners.es.po
+++ b/spanish/po/partners.es.po
@@ -686,11 +686,14 @@ msgstr ""
"operativos de software libre."
#~ msgid ""
-#~ "They are a UK based web hosting, domain registration and co-location "
-#~ "company."
+#~ "credativ is a service oriented company focusing on open-source software "
+#~ "since its foundation in 1999. World-wide Debian support is provided by "
+#~ "credativ's <q>Open Source Support Centers</q> around the globe."
#~ msgstr ""
-#~ "Son una empresa de alojamiento web, registro de dominio y co-localización "
-#~ "basada en Reino Unido."
+#~ " credativ es una empresa orientada a servicios, enfocada en software de "
+#~ "código abierto desde su fundación en 1999. Proporciona soporte a Debian a "
+#~ "nivel mundial a través de los <q>Centros de Soporte de Código Abierto</q> "
+#~ "de credativ en todo el globo."
#~ msgid ""
#~ "A large number of credativ staff are Debian developers, several of them "
@@ -704,11 +707,8 @@ msgstr ""
#~ "visite <url \"http://www.credativ.com/\">."
#~ msgid ""
-#~ "credativ is a service oriented company focusing on open-source software "
-#~ "since its foundation in 1999. World-wide Debian support is provided by "
-#~ "credativ's <q>Open Source Support Centers</q> around the globe."
+#~ "They are a UK based web hosting, domain registration and co-location "
+#~ "company."
#~ msgstr ""
-#~ " credativ es una empresa orientada a servicios, enfocada en software de "
-#~ "código abierto desde su fundación en 1999. Proporciona soporte a Debian a "
-#~ "nivel mundial a través de los <q>Centros de Soporte de Código Abierto</q> "
-#~ "de credativ en todo el globo."
+#~ "Son una empresa de alojamiento web, registro de dominio y co-localización "
+#~ "basada en Reino Unido."
diff --git a/spanish/po/ports.es.po b/spanish/po/ports.es.po
index 15a35add363..e21506d7a2d 100644
--- a/spanish/po/ports.es.po
+++ b/spanish/po/ports.es.po
@@ -118,136 +118,136 @@ msgstr "Debian para PowerPC"
msgid "Debian for Sparc"
msgstr "Debian para Sparc"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian para AMD64"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian para portátiles"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian para ARM"
+#~ msgid "Vendor/Name"
+#~ msgstr "Nombre/Fabricante"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian para Beowulf"
+#~ msgid "Date announced"
+#~ msgstr "Fecha de presentación"
-#~ msgid "Main"
-#~ msgstr "Principal"
+#~ msgid "Clock"
+#~ msgstr "Reloj"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian para Motorola 680x0"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian para MIPS"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian para S/390"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian para Sparc64"
+#~ msgid "Specials"
+#~ msgstr "Especiales"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD basada en libc5"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Sin FPU (R2010), cachés externas"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, controladora LCD, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Sin FPU (R3010)"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, puerto paralelo, RTC, Audio, PCIC"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Caché L1 con índices virtuales, controladora de caché L2"
+
+#~ msgid "External L1 cache"
+#~ msgstr "Caché L1 externa"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "CPU de múltiples chips"
#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
#~ msgstr ""
-#~ "Mips 16, RTC, teclado, TouchPanel, Audio, Compact-Flash, UART, puerto "
-#~ "paralelo"
+#~ "Extensión isa Mips16, Sin FPU, flash de 512k, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "Sin FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, controladora LCD"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 caché en placa"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "Sin FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, bus externo de 64 bits, caché L2 externa"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Sin FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, bus externo de 64 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Sin FPU, SDRAMC, ROMC, Timer, PCMCIA, controladora LCD, IrDA"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, bus externo de 32 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Sin FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, controladora LCD, IrDA"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 Ethernet 10/100, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "Sin FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
#~ msgstr "Sin FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "Sin FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 Ethernet 10/100, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Sin FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, controladora LCD, IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, bus externo de 32 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Sin FPU, SDRAMC, ROMC, Timer, PCMCIA, controladora LCD, IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, bus externo de 64 bits"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Sin FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, bus externo de 64 bits, caché L2 externa"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "Sin FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 caché en placa"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "Sin FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, controladora LCD"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
#~ msgstr ""
-#~ "Extensión isa Mips16, Sin FPU, flash de 512k, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
-
-#~ msgid "Multiple chip CPU"
-#~ msgstr "CPU de múltiples chips"
-
-#~ msgid "External L1 cache"
-#~ msgstr "Caché L1 externa"
+#~ "Mips 16, RTC, teclado, TouchPanel, Audio, Compact-Flash, UART, puerto "
+#~ "paralelo"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Caché L1 con índices virtuales, controladora de caché L2"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, puerto paralelo, RTC, Audio, PCIC"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Sin FPU (R3010)"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, controladora LCD, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Sin FPU (R2010), cachés externas"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD basada en libc5"
-#~ msgid "Specials"
-#~ msgstr "Especiales"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian para Sparc64"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian para S/390"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian para MIPS"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian para Motorola 680x0"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Clock"
-#~ msgstr "Reloj"
+#~ msgid "Main"
+#~ msgstr "Principal"
-#~ msgid "Date announced"
-#~ msgstr "Fecha de presentación"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian para Beowulf"
-#~ msgid "Vendor/Name"
-#~ msgstr "Nombre/Fabricante"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian para ARM"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian para portátiles"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian para AMD64"
diff --git a/spanish/po/stats.es.po b/spanish/po/stats.es.po
index 601707298da..d1728e14cfd 100644
--- a/spanish/po/stats.es.po
+++ b/spanish/po/stats.es.po
@@ -56,79 +56,90 @@ msgstr "Hay %d bytes por traducir."
msgid "There are %d strings to translate."
msgstr "Hay %d cadenas de caracteres por traducir."
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
-msgid "This translation is too out of date"
-msgstr "Esta traducción está muy desactualizada"
-
-#: ../../stattrans.pl:241 ../../stattrans.pl:437
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Versión incorrecta de traducción"
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Esta traducción está muy desactualizada"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "La original es más nueva que esta traducción"
-#: ../../stattrans.pl:248 ../../stattrans.pl:437
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "La original ya no existe"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "contador de visitas N/A"
-#: ../../stattrans.pl:413
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "visitas"
-#: ../../stattrans.pl:431 ../../stattrans.pl:432
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Haga clic para obtener la información de diffstat"
-#: ../../stattrans.pl:446 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Diff unificado"
-#: ../../stattrans.pl:449 ../../stattrans.pl:590 ../../stattrans.pl:591
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Diff coloreado"
-#: ../../stattrans.pl:551 ../../stattrans.pl:693
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Diff coloreado"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Creado con <transstatslink>"
-#: ../../stattrans.pl:556
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Resumen de traducción para"
-#: ../../stattrans.pl:559 ../../stattrans.pl:717 ../../stattrans.pl:763
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Sin traducir"
-#: ../../stattrans.pl:559 ../../stattrans.pl:716 ../../stattrans.pl:762
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Desactualizado"
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Traducido"
-#: ../../stattrans.pl:559 ../../stattrans.pl:641 ../../stattrans.pl:715
-#: ../../stattrans.pl:761 ../../stattrans.pl:804
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Actualizado"
-#: ../../stattrans.pl:560 ../../stattrans.pl:561 ../../stattrans.pl:562
-#: ../../stattrans.pl:563
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "ficheros"
-#: ../../stattrans.pl:566 ../../stattrans.pl:567 ../../stattrans.pl:568
-#: ../../stattrans.pl:569
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:576
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -136,131 +147,131 @@ msgstr ""
"Nota: el listado de páginas está ordenado por popularidad. Coloque el ratón "
"sobre el nombre de la página para ver el número de visitas."
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Traducciones desactualizadas"
-#: ../../stattrans.pl:584 ../../stattrans.pl:640
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Fichero"
-#: ../../stattrans.pl:586 ../../stattrans.pl:592
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diferencias"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Comentarios"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:594
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Registro"
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Traducción"
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Encargado"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Estado"
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Traductor"
-#: ../../stattrans.pl:600
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Fecha"
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Páginas generales no traducidas"
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Páginas generales sin traducir"
-#: ../../stattrans.pl:613
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Elementos de noticias no traducidos"
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Elementos de noticias sin traducir"
-#: ../../stattrans.pl:619
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Páginas de consultores/usuarios no traducidas"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Páginas de consultores/usuarios sin traducir"
-#: ../../stattrans.pl:625
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Páginas internacionales no traducidas"
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Páginas internacionales sin traducir"
-#: ../../stattrans.pl:631
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Páginas traducidas (actualizadas)"
-#: ../../stattrans.pl:638 ../../stattrans.pl:788
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Plantillas traducidas (ficheros PO)"
-#: ../../stattrans.pl:639 ../../stattrans.pl:791
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Estadísticas de traducción de ficheros PO"
-#: ../../stattrans.pl:642 ../../stattrans.pl:805
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Impreciso"
-#: ../../stattrans.pl:643
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Sin traducir"
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:661
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:695
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Páginas web traducidas"
-#: ../../stattrans.pl:698
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Estadísticas de traducción por número de páginas"
-#: ../../stattrans.pl:713 ../../stattrans.pl:759 ../../stattrans.pl:803
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Idioma"
-#: ../../stattrans.pl:714 ../../stattrans.pl:760
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Traducciones"
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Páginas web traducidas (por tamaño)"
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Estadísticas de traducción por tamaño de las páginas"
diff --git a/spanish/po/templates.es.po b/spanish/po/templates.es.po
index 03d65430181..aa51507eded 100644
--- a/spanish/po/templates.es.po
+++ b/spanish/po/templates.es.po
@@ -200,12 +200,19 @@ msgstr "en la versión 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Para informar de un problema con el sitio web, por favor, envíe un correo "
"(en inglés) a nuestra lista de correo con archivo público <a href=\"mailto:"
@@ -508,6 +515,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Nota:</em> La página original de esta traducción ya no existe."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -516,362 +527,291 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Volver a la <a href=\"./\">página \"¿Quién usa Debian?\"</a>."
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Visite el servidor de nuestro patrocinador"
+#~ msgid "List of Consultants"
+#~ msgstr "Lista de consultores"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "¿Ha encontrado un problema con el diseño del sitio?"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Volver a la <a href=\"./\">página de consultores de Debian</a>."
-#~ msgid "Report it!"
-#~ msgstr "¡Repórtelo!"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Seleccione un servidor cerca de usted: &nbsp;"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Descargar con jigdo"
-#~ msgid "More information:"
-#~ msgstr "Más información:"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Descargar mediante HTTP/FTP"
-#~ msgid "Taken by:"
-#~ msgstr "Responsable:"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Comprar CDs o DVDs"
-#~ msgid "Nobody"
-#~ msgstr "Nadie"
+#~ msgid "Network Install"
+#~ msgstr "Instalación via red"
-#~ msgid "Rating:"
-#~ msgstr "Puntuación:"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Descargar"
-#~ msgid "More information"
-#~ msgstr "Información adicional"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />miscelánea"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Próximas atracciones"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Arte"
-#~ msgid "link may no longer be valid"
-#~ msgstr "puede que el enlace ya no sea válido"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Réplicas"
-#~ msgid "When"
-#~ msgstr "Cuándo"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Réplicas rsync"
-#~ msgid "Where"
-#~ msgstr "Dónde"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Descargar con Torrent"
-#~ msgid "More Info"
-#~ msgstr "Información adicional"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Información de imágenes de distribución"
-#~ msgid "Debian Involvement"
-#~ msgstr "Implicación de Debian"
+#~ msgid "Debian CD team"
+#~ msgstr "Equipo de CDs de Debian"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordinador principal"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_en_cd"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordinador del</th><th>Proyecto</th>"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "Related Links"
-#~ msgstr "Enlaces relacionados"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "Latest News"
-#~ msgstr "Últimas noticias"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Download calendar entry"
-#~ msgstr "Descargar entrada del calendario"
+#~ msgid "buy"
+#~ msgstr "comprar"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Volver a las <a href=\"m4_HOME/\">noticias Debian</a> || <a href="
-#~ "\"m4_HOME/\">página principal del proyecto Debian</a>."
+#~ msgid "net_install"
+#~ msgstr "instalación_por_red"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (enlace no válido)"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />misc"
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Para recibir este boletín cada dos semanas en su buzón, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">suscríbase a la lista de correo debian-"
-#~ "news</a>."
+#~ "<a href=\"/MailingLists/disclaimer\">Lista pública de correo</a> en "
+#~ "inglés para CDs/DVDs:"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Puede conseguir <a href=\"../../\">ejemplares anteriores</a> de este "
-#~ "boletín."
+#~ msgid "Date"
+#~ msgstr "Fecha"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Los editores de las Noticias del Proyecto Debian "
-#~ "son <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Línea temporal"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Las Noticias del Proyecto Debian las editan <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Nominaciones"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edición de las Noticias del Proyecto Debian "
-#~ "la editó <a href=\"mailto:debian-publicity@debian.org\">%s</a>."
+#~ msgid "Debate"
+#~ msgstr "Debate"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Esta edición de las Noticias del Proyecto Debian "
-#~ "las editó <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Platforms"
+#~ msgstr "Plataformas"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />La tradujo %s."
+#~ msgid "Proposer"
+#~ msgstr "Proponente"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" /> La tradujo %s."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Proponente propuesta A"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />La tradujo %s."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Proponente propuesta B"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Las tradujo %s."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Proponente propuesta C"
-#~ msgid "List of Speakers"
-#~ msgstr "Lista de oradores"
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Proponente propuesta D"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Volver a la <a href=\"./\">página de oradores de Debian</a>."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Proponente propuesta E"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "Para recibir este boletín semanalmente en su buzón, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">suscríbase</a> a la lista de correo "
-#~ "debian-news."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Proponente propuesta F"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Las Noticias Semanales de Debian son editadas por "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Seconds"
+#~ msgstr "Apoyos"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Apoyos a la propuesta A"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edición de las Noticias Semanales de Debian "
-#~ "fue realizada por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Apoyos a la propuesta B"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Apoyos a la propuesta C"
-#~ msgid "No requests for adoption"
-#~ msgstr "No hay solicitudes de adopción"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Apoyos a la propuesta D"
-#~ msgid "No orphaned packages"
-#~ msgstr "No hay paquetes huérfanos"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Apoyos a la propuesta E"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "No hay paquetes en espera de ser adoptados"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Apoyos a la propuesta F"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "No hay paquetes en espera de ser empaquetados"
+#~ msgid "Opposition"
+#~ msgstr "Oposiciones"
-#~ msgid "No Requested packages"
-#~ msgstr "No se han solicitado paquetes"
+#~ msgid "Text"
+#~ msgstr "Texto"
-#~ msgid "No help requested"
-#~ msgstr "No se ha solicitado ayuda"
+#~ msgid "Proposal A"
+#~ msgstr "Propuesta A"
-#~ msgid "in adoption since today."
-#~ msgstr "en adopción desde hoy."
+#~ msgid "Proposal B"
+#~ msgstr "Propuesta B"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "en adopción desde ayer."
+#~ msgid "Proposal C"
+#~ msgstr "Propuesta C"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s días en adopción."
+#~ msgid "Proposal D"
+#~ msgstr "Propuesta D"
-#~ msgid "in preparation since today."
-#~ msgstr "en preparación desde hoy."
+#~ msgid "Proposal E"
+#~ msgstr "Propuesta E"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "en preparación desde ayer."
+#~ msgid "Proposal F"
+#~ msgstr "Propuesta F"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s días en preparación."
+#~ msgid "Choices"
+#~ msgstr "Opciones"
-#~ msgid "requested today."
-#~ msgstr "solicitados hoy."
+#~ msgid "Amendment Proposer"
+#~ msgstr "Proponente de la enmienda"
-#~ msgid "requested yesterday."
-#~ msgstr "solicitados ayer."
+#~ msgid "Amendment Seconds"
+#~ msgstr "Apoyos a la enmienda"
-#~ msgid "requested %s days ago."
-#~ msgstr "solicitados hace %s días."
+#~ msgid "Amendment Text"
+#~ msgstr "Texto de la enmienda"
-#~ msgid "package info"
-#~ msgstr "información del paquete"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Proponente de la enmienda A"
-#~ msgid "License Information"
-#~ msgstr "Información sobre licencias"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Apoyos a la enmienda A"
-#~ msgid "DLS Index"
-#~ msgstr "Índice RLD"
+#~ msgid "Amendment Text A"
+#~ msgstr "Texto de la enmienda A"
-#~ msgid "DFSG"
-#~ msgstr "DSLD"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Proponente de la enmienda B"
-#~ msgid "DFSG FAQ"
-#~ msgstr "Preguntas frecuentes DSLD"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Apoyos a la enmienda B"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Archivo de Debian-legal"
+#~ msgid "Amendment Text B"
+#~ msgstr "Texto de la enmienda B"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Amendments"
+#~ msgstr "Enmiendas"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Versión %s: %s"
+#~ msgid "Proceedings"
+#~ msgstr "Procedimientos"
-#~ msgid "Date published"
-#~ msgstr "Fecha de publicación"
+#~ msgid "Majority Requirement"
+#~ msgstr "Mayoría necesaria"
-#~ msgid "License"
-#~ msgstr "Licencia"
+#~ msgid "Data and Statistics"
+#~ msgstr "Datos y estadísticas"
-#~ msgid "Version"
-#~ msgstr "Versión"
+#~ msgid "Quorum"
+#~ msgstr "Quórum"
-#~ msgid "Summary"
-#~ msgstr "Resumen"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Mínima discusión"
-#~ msgid "Justification"
-#~ msgstr "Justificación"
+#~ msgid "Ballot"
+#~ msgstr "Voto"
-#~ msgid "Discussion"
-#~ msgstr "Discusión"
+#~ msgid "Forum"
+#~ msgstr "Foro"
-#~ msgid "Original Summary"
-#~ msgstr "Resumen original"
+#~ msgid "Outcome"
+#~ msgstr "Resultado"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Se puede encontrar el resumen original de <summary-author/> en los <a "
-#~ "href=\"<summary-url/>\">archivos de la lista</a>."
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Esperando&nbsp;Patrocinadores"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "<summary-author> preparó este resumen."
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "En&nbsp;Discusión"
-#~ msgid "License text (translated)"
-#~ msgstr "Texto de la licencia (traducido)"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Votación&nbsp;en&nbsp;Curso"
-#~ msgid "License text"
-#~ msgstr "Texto de la licencia"
+#~ msgid "Decided"
+#~ msgstr "Decidido"
-#~ msgid "free"
-#~ msgstr "libre"
+#~ msgid "Withdrawn"
+#~ msgstr "Retirado"
-#~ msgid "non-free"
-#~ msgstr "no-libre"
+#~ msgid "Other"
+#~ msgstr "Otro"
-#~ msgid "not redistributable"
-#~ msgstr "no redistribuible"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Página&nbsp;Principal&nbsp;de&nbsp;Votaciones"
-#~ msgid "Free"
-#~ msgstr "Libre"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Cómo"
-#~ msgid "Non-Free"
-#~ msgstr "No-libre"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Enviar&nbsp;Propuesta"
-#~ msgid "Not Redistributable"
-#~ msgstr "No redistribuible"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Enmendar&nbsp;una&nbsp;Propuesta"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Consulte la página con la <a href=\"./\">información de licencias</a> "
-#~ "para tener una visión general de los resúmenes de licencias de Debian "
-#~ "(RLD)."
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Apoyar&nbsp;una&nbsp;Propuesta"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Kit pseudo-imagen"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Leer&nbsp;un&nbsp;Resultado"
-#~ msgid "discussed"
-#~ msgstr "discutido"
+#~ msgid "Vote"
+#~ msgstr "Votar"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Las Noticias Semanales de Debian son editadas por <a href=\"mailto:"
-#~ "dwn@debian.org\">Martin 'Joey' Schulze</a>."
+#~ msgid "network install"
+#~ msgstr "instalación en red"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
-#~ "dwn@debian.org\">Yooseong Yang y Martin 'Joey' Schulze</a>."
+#~ msgid "buy pre-made images"
+#~ msgstr "compre imágenes prefabricadas"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
-#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier y Martin 'Joey' Schulze</a>."
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Volver a otras <a href=\"./\">noticias de Debian</a>."
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
-#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary y Tollef "
-#~ "Fog Heen</a>."
-
-#~ msgid "download with pik"
-#~ msgstr "descargar con pik"
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (enlace roto)"
+#~ "Vea la <a href=\"m4_HOME/contact\">página de contactos</a> de Debian para "
+#~ "más información sobre cómo contactar con nosotros."
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Aviso de seguridad de Debian"
+#~ msgid "Please use English when sending mail."
+#~ msgstr "Por favor, utilice el inglés cuando envíe correos."
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Avisos de seguridad de Debian"
+#~ msgid "Security database references"
+#~ msgstr "Referencias a bases de datos de seguridad"
-#~ msgid "Vulnerable"
-#~ msgstr "Vulnerable"
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "En el diccionario CVE de Mitre:"
-#~ msgid "Fixed in"
-#~ msgstr "Arreglado en"
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "En la base de datos de Bugtraq (en SecurityFocus):"
-#~ msgid "Source:"
-#~ msgstr "Fuentes:"
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "Notas y avisos de incidentes y vulnerabilidades en CERT:"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Componentes independientes de la arquitectura:"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "No se dispone, de momento, de referencias a otras bases de datos de "
+#~ "seguridad externas."
#~ msgid ""
#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
@@ -880,288 +820,359 @@ msgstr "Volver a la <a href=\"./\">página \"¿Quién usa Debian?\"</a>."
#~ "Las sumas MD5 de los ficheros que se listan están disponibles en el <a "
#~ "href=\"<get-var url />\">aviso original</a>."
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "No se dispone, de momento, de referencias a otras bases de datos de "
-#~ "seguridad externas."
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Componentes independientes de la arquitectura:"
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "Notas y avisos de incidentes y vulnerabilidades en CERT:"
+#~ msgid "Source:"
+#~ msgstr "Fuentes:"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "En la base de datos de Bugtraq (en SecurityFocus):"
+#~ msgid "Fixed in"
+#~ msgstr "Arreglado en"
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "En el diccionario CVE de Mitre:"
+#~ msgid "Vulnerable"
+#~ msgstr "Vulnerable"
-#~ msgid "Security database references"
-#~ msgstr "Referencias a bases de datos de seguridad"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Avisos de seguridad de Debian"
-#~ msgid "Please use English when sending mail."
-#~ msgstr "Por favor, utilice el inglés cuando envíe correos."
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Aviso de seguridad de Debian"
+
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (enlace roto)"
+
+#~ msgid "download with pik"
+#~ msgstr "descargar con pik"
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#~ msgstr ""
-#~ "Vea la <a href=\"m4_HOME/contact\">página de contactos</a> de Debian para "
-#~ "más información sobre cómo contactar con nosotros."
+#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
+#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary y Tollef "
+#~ "Fog Heen</a>."
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Volver a otras <a href=\"./\">noticias de Debian</a>."
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
+#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier y Martin 'Joey' Schulze</a>."
-#~ msgid "buy pre-made images"
-#~ msgstr "compre imágenes prefabricadas"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
+#~ "dwn@debian.org\">Yooseong Yang y Martin 'Joey' Schulze</a>."
-#~ msgid "network install"
-#~ msgstr "instalación en red"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Las Noticias Semanales de Debian son editadas por <a href=\"mailto:"
+#~ "dwn@debian.org\">Martin 'Joey' Schulze</a>."
-#~ msgid "Vote"
-#~ msgstr "Votar"
+#~ msgid "discussed"
+#~ msgstr "discutido"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Leer&nbsp;un&nbsp;Resultado"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Kit pseudo-imagen"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Apoyar&nbsp;una&nbsp;Propuesta"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Consulte la página con la <a href=\"./\">información de licencias</a> "
+#~ "para tener una visión general de los resúmenes de licencias de Debian "
+#~ "(RLD)."
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Enmendar&nbsp;una&nbsp;Propuesta"
+#~ msgid "Not Redistributable"
+#~ msgstr "No redistribuible"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Enviar&nbsp;Propuesta"
+#~ msgid "Non-Free"
+#~ msgstr "No-libre"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Cómo"
+#~ msgid "Free"
+#~ msgstr "Libre"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Página&nbsp;Principal&nbsp;de&nbsp;Votaciones"
+#~ msgid "not redistributable"
+#~ msgstr "no redistribuible"
-#~ msgid "Other"
-#~ msgstr "Otro"
+#~ msgid "non-free"
+#~ msgstr "no-libre"
-#~ msgid "Withdrawn"
-#~ msgstr "Retirado"
+#~ msgid "free"
+#~ msgstr "libre"
-#~ msgid "Decided"
-#~ msgstr "Decidido"
+#~ msgid "License text"
+#~ msgstr "Texto de la licencia"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Votación&nbsp;en&nbsp;Curso"
+#~ msgid "License text (translated)"
+#~ msgstr "Texto de la licencia (traducido)"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "En&nbsp;Discusión"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "<summary-author> preparó este resumen."
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Esperando&nbsp;Patrocinadores"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Se puede encontrar el resumen original de <summary-author/> en los <a "
+#~ "href=\"<summary-url/>\">archivos de la lista</a>."
-#~ msgid "Outcome"
-#~ msgstr "Resultado"
+#~ msgid "Original Summary"
+#~ msgstr "Resumen original"
-#~ msgid "Forum"
-#~ msgstr "Foro"
+#~ msgid "Discussion"
+#~ msgstr "Discusión"
-#~ msgid "Ballot"
-#~ msgstr "Voto"
+#~ msgid "Justification"
+#~ msgstr "Justificación"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Mínima discusión"
+#~ msgid "Summary"
+#~ msgstr "Resumen"
-#~ msgid "Quorum"
-#~ msgstr "Quórum"
+#~ msgid "Version"
+#~ msgstr "Versión"
-#~ msgid "Data and Statistics"
-#~ msgstr "Datos y estadísticas"
+#~ msgid "License"
+#~ msgstr "Licencia"
-#~ msgid "Majority Requirement"
-#~ msgstr "Mayoría necesaria"
+#~ msgid "Date published"
+#~ msgstr "Fecha de publicación"
-#~ msgid "Proceedings"
-#~ msgstr "Procedimientos"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Versión %s: %s"
-#~ msgid "Amendments"
-#~ msgstr "Enmiendas"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Amendment Text B"
-#~ msgstr "Texto de la enmienda B"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Archivo de Debian-legal"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Apoyos a la enmienda B"
+#~ msgid "DFSG FAQ"
+#~ msgstr "Preguntas frecuentes DSLD"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Proponente de la enmienda B"
+#~ msgid "DFSG"
+#~ msgstr "DSLD"
-#~ msgid "Amendment Text A"
-#~ msgstr "Texto de la enmienda A"
+#~ msgid "DLS Index"
+#~ msgstr "Índice RLD"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Apoyos a la enmienda A"
+#~ msgid "License Information"
+#~ msgstr "Información sobre licencias"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Proponente de la enmienda A"
+#~ msgid "package info"
+#~ msgstr "información del paquete"
-#~ msgid "Amendment Text"
-#~ msgstr "Texto de la enmienda"
+#~ msgid "requested %s days ago."
+#~ msgstr "solicitados hace %s días."
-#~ msgid "Amendment Seconds"
-#~ msgstr "Apoyos a la enmienda"
+#~ msgid "requested yesterday."
+#~ msgstr "solicitados ayer."
-#~ msgid "Amendment Proposer"
-#~ msgstr "Proponente de la enmienda"
+#~ msgid "requested today."
+#~ msgstr "solicitados hoy."
-#~ msgid "Choices"
-#~ msgstr "Opciones"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s días en preparación."
-#~ msgid "Proposal F"
-#~ msgstr "Propuesta F"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "en preparación desde ayer."
-#~ msgid "Proposal E"
-#~ msgstr "Propuesta E"
+#~ msgid "in preparation since today."
+#~ msgstr "en preparación desde hoy."
-#~ msgid "Proposal D"
-#~ msgstr "Propuesta D"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s días en adopción."
-#~ msgid "Proposal C"
-#~ msgstr "Propuesta C"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "en adopción desde ayer."
-#~ msgid "Proposal B"
-#~ msgstr "Propuesta B"
+#~ msgid "in adoption since today."
+#~ msgstr "en adopción desde hoy."
-#~ msgid "Proposal A"
-#~ msgstr "Propuesta A"
+#~ msgid "No help requested"
+#~ msgstr "No se ha solicitado ayuda"
-#~ msgid "Text"
-#~ msgstr "Texto"
+#~ msgid "No Requested packages"
+#~ msgstr "No se han solicitado paquetes"
-#~ msgid "Opposition"
-#~ msgstr "Oposiciones"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "No hay paquetes en espera de ser empaquetados"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Apoyos a la propuesta F"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "No hay paquetes en espera de ser adoptados"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Apoyos a la propuesta E"
+#~ msgid "No orphaned packages"
+#~ msgstr "No hay paquetes huérfanos"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Apoyos a la propuesta D"
+#~ msgid "No requests for adoption"
+#~ msgstr "No hay solicitudes de adopción"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Apoyos a la propuesta C"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Apoyos a la propuesta B"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edición de las Noticias Semanales de Debian "
+#~ "fue realizada por <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Apoyos a la propuesta A"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Seconds"
-#~ msgstr "Apoyos"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Las Noticias Semanales de Debian son editadas por "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Proponente propuesta F"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "Para recibir este boletín semanalmente en su buzón, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">suscríbase</a> a la lista de correo "
+#~ "debian-news."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Proponente propuesta E"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Volver a la <a href=\"./\">página de oradores de Debian</a>."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Proponente propuesta D"
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de oradores"
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Proponente propuesta C"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Las tradujo %s."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Proponente propuesta B"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />La tradujo %s."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Proponente propuesta A"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" /> La tradujo %s."
-#~ msgid "Proposer"
-#~ msgstr "Proponente"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />La tradujo %s."
-#~ msgid "Platforms"
-#~ msgstr "Plataformas"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Esta edición de las Noticias del Proyecto Debian "
+#~ "las editó <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Debate"
-#~ msgstr "Debate"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edición de las Noticias del Proyecto Debian "
+#~ "la editó <a href=\"mailto:debian-publicity@debian.org\">%s</a>."
-#~ msgid "Nominations"
-#~ msgstr "Nominaciones"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Las Noticias del Proyecto Debian las editan <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Time Line"
-#~ msgstr "Línea temporal"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Los editores de las Noticias del Proyecto Debian "
+#~ "son <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Date"
-#~ msgstr "Fecha"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Puede conseguir <a href=\"../../\">ejemplares anteriores</a> de este "
+#~ "boletín."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">Lista pública de correo</a> en "
-#~ "inglés para CDs/DVDs:"
+#~ "Para recibir este boletín cada dos semanas en su buzón, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">suscríbase a la lista de correo debian-"
+#~ "news</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />misc"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (enlace no válido)"
-#~ msgid "net_install"
-#~ msgstr "instalación_por_red"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Volver a las <a href=\"m4_HOME/\">noticias Debian</a> || <a href="
+#~ "\"m4_HOME/\">página principal del proyecto Debian</a>."
-#~ msgid "buy"
-#~ msgstr "comprar"
+#~ msgid "Download calendar entry"
+#~ msgstr "Descargar entrada del calendario"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Latest News"
+#~ msgstr "Últimas noticias"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Related Links"
+#~ msgstr "Enlaces relacionados"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordinador del</th><th>Proyecto</th>"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_en_cd"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordinador principal"
-#~ msgid "Debian CD team"
-#~ msgstr "Equipo de CDs de Debian"
+#~ msgid "Debian Involvement"
+#~ msgstr "Implicación de Debian"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Información de imágenes de distribución"
+#~ msgid "More Info"
+#~ msgstr "Información adicional"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Descargar con Torrent"
+#~ msgid "Where"
+#~ msgstr "Dónde"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Réplicas rsync"
+#~ msgid "When"
+#~ msgstr "Cuándo"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Réplicas"
+#~ msgid "link may no longer be valid"
+#~ msgstr "puede que el enlace ya no sea válido"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Arte"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Próximas atracciones"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />miscelánea"
+#~ msgid "More information"
+#~ msgstr "Información adicional"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Descargar"
+#~ msgid "Rating:"
+#~ msgstr "Puntuación:"
-#~ msgid "Network Install"
-#~ msgstr "Instalación via red"
+#~ msgid "Nobody"
+#~ msgstr "Nadie"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Comprar CDs o DVDs"
+#~ msgid "Taken by:"
+#~ msgstr "Responsable:"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Descargar mediante HTTP/FTP"
+#~ msgid "More information:"
+#~ msgstr "Más información:"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Descargar con jigdo"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Seleccione un servidor cerca de usted: &nbsp;"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Report it!"
+#~ msgstr "¡Repórtelo!"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Volver a la <a href=\"./\">página de consultores de Debian</a>."
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "¿Ha encontrado un problema con el diseño del sitio?"
-#~ msgid "List of Consultants"
-#~ msgstr "Lista de consultores"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Visite el servidor de nuestro patrocinador"
diff --git a/spanish/po/vendors.es.po b/spanish/po/vendors.es.po
index 56f90d8adc4..8fbb84b02c9 100644
--- a/spanish/po/vendors.es.po
+++ b/spanish/po/vendors.es.po
@@ -68,35 +68,35 @@ msgstr "fuente"
msgid "and"
msgstr "y"
-#~ msgid "Architectures:"
-#~ msgstr "Arquitecturas:"
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
-#~ msgid "USB Type:"
-#~ msgstr "Tipo de USB:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL para la página de Debian:"
-#~ msgid "BD Type:"
-#~ msgstr "Tipo de BD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Acepta donaciones para Debian:"
-#~ msgid "DVD Type:"
-#~ msgstr "Tipo de DVD:"
+#~ msgid "Country:"
+#~ msgstr "País:"
-#~ msgid "CD Type:"
-#~ msgstr "Tipo de CD:"
+#~ msgid "Ship International:"
+#~ msgstr "Envíos Internacionales:"
#~ msgid "email:"
#~ msgstr "correo electrónico:"
-#~ msgid "Ship International:"
-#~ msgstr "Envíos Internacionales:"
+#~ msgid "CD Type:"
+#~ msgstr "Tipo de CD:"
-#~ msgid "Country:"
-#~ msgstr "País:"
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo de DVD:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Acepta donaciones para Debian:"
+#~ msgid "BD Type:"
+#~ msgstr "Tipo de BD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL para la página de Debian:"
+#~ msgid "USB Type:"
+#~ msgstr "Tipo de USB:"
-#~ msgid "Vendor:"
-#~ msgstr "Vendedor:"
+#~ msgid "Architectures:"
+#~ msgstr "Arquitecturas:"
diff --git a/swedish/po/blends.sv.po b/swedish/po/blends.sv.po
index ed2a99923b3..59b3bc95e19 100644
--- a/swedish/po/blends.sv.po
+++ b/swedish/po/blends.sv.po
@@ -168,8 +168,8 @@ msgstr ""
"Målet med DebianParl är att tillhandahålla program för att ge stöd till "
"behoven hos parlamentariker, politiker och deras personal runt hela världen."
-#~ msgid "Debian Games"
-#~ msgstr "Debian Games"
-
#~ msgid "Debian Accessibility"
#~ msgstr "Debian Accessibility"
+
+#~ msgid "Debian Games"
+#~ msgstr "Debian Games"
diff --git a/swedish/po/bugs.sv.po b/swedish/po/bugs.sv.po
index aa1ea853166..d5b65b2e4e1 100644
--- a/swedish/po/bugs.sv.po
+++ b/swedish/po/bugs.sv.po
@@ -158,152 +158,152 @@ msgstr "Arkiverad"
msgid "Archived and Unarchived"
msgstr "Arkiverade och ej arkiverade"
-#~ msgid "Exclude tag:"
-#~ msgstr "Exkludera märke:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Inkludera märke:"
+#~ msgid "Flags:"
+#~ msgstr "Flaggor:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "aktiva fel"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "visa endast hopslagna rapporter en gång"
-#~ msgid "wontfix"
-#~ msgstr "kommer ej rätta"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/allvarlighetsgrad"
-#~ msgid "upstream"
-#~ msgstr "uppströms"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "visa inte innehållsförteckning i sidhuvudet"
-#~ msgid "unreproducible"
-#~ msgstr "oreproducerbar"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "visa inte statistik i sidfoten"
-#~ msgid "security"
-#~ msgstr "säkerhet"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "mer info"
+#~ msgid "Package version:"
+#~ msgstr "Paketversion:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Distribution:"
-#~ msgid "help"
-#~ msgstr "hjälp"
+#~ msgid "bugs"
+#~ msgstr "fel"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixad-uppströms"
+#~ msgid "open"
+#~ msgstr "öppet"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixad-i-experimentella"
+#~ msgid "forwarded"
+#~ msgstr "vidaresänt"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "på gång"
-#~ msgid "confirmed"
-#~ msgstr "bekräftat"
+#~ msgid "fixed"
+#~ msgstr "rättat"
-#~ msgid "sid"
-#~ msgstr "Sid"
+#~ msgid "done"
+#~ msgstr "klart"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignorera"
+#~ msgid "Include status:"
+#~ msgstr "Inkludera status:"
-#~ msgid "lenny"
-#~ msgstr "Lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Exkludera status:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignorera"
+#~ msgid "critical"
+#~ msgstr "kritiskt"
-#~ msgid "etch"
-#~ msgstr "Etch"
+#~ msgid "grave"
+#~ msgstr "gravt"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignorera"
+#~ msgid "serious"
+#~ msgstr "allvarligt"
-#~ msgid "woody"
-#~ msgstr "Woody"
+#~ msgid "important"
+#~ msgstr "viktigt"
-#~ msgid "potato"
-#~ msgstr "Potato"
+#~ msgid "minor"
+#~ msgstr "mindre"
-#~ msgid "Exclude severity:"
-#~ msgstr "Exkludera allvarlighetsgrader:"
+#~ msgid "wishlist"
+#~ msgstr "önskelista"
#~ msgid "Include severity:"
#~ msgstr "Inkludera allvarlighetsgrader:"
-#~ msgid "wishlist"
-#~ msgstr "önskelista"
+#~ msgid "Exclude severity:"
+#~ msgstr "Exkludera allvarlighetsgrader:"
-#~ msgid "minor"
-#~ msgstr "mindre"
+#~ msgid "potato"
+#~ msgstr "Potato"
-#~ msgid "important"
-#~ msgstr "viktigt"
+#~ msgid "woody"
+#~ msgstr "Woody"
-#~ msgid "serious"
-#~ msgstr "allvarligt"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignorera"
-#~ msgid "grave"
-#~ msgstr "gravt"
+#~ msgid "etch"
+#~ msgstr "Etch"
-#~ msgid "critical"
-#~ msgstr "kritiskt"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignorera"
-#~ msgid "Exclude status:"
-#~ msgstr "Exkludera status:"
+#~ msgid "lenny"
+#~ msgstr "Lenny"
-#~ msgid "Include status:"
-#~ msgstr "Inkludera status:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignorera"
-#~ msgid "done"
-#~ msgstr "klart"
+#~ msgid "sid"
+#~ msgstr "Sid"
-#~ msgid "fixed"
-#~ msgstr "rättat"
+#~ msgid "confirmed"
+#~ msgstr "bekräftat"
-#~ msgid "pending"
-#~ msgstr "på gång"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "vidaresänt"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixad-i-experimentella"
-#~ msgid "open"
-#~ msgstr "öppet"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixad-uppströms"
-#~ msgid "bugs"
-#~ msgstr "fel"
+#~ msgid "help"
+#~ msgstr "hjälp"
-#~ msgid "Distribution:"
-#~ msgstr "Distribution:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Paketversion:"
+#~ msgid "moreinfo"
+#~ msgstr "mer info"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "säkerhet"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "visa inte statistik i sidfoten"
+#~ msgid "unreproducible"
+#~ msgstr "oreproducerbar"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "visa inte innehållsförteckning i sidhuvudet"
+#~ msgid "upstream"
+#~ msgstr "uppströms"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/allvarlighetsgrad"
+#~ msgid "wontfix"
+#~ msgstr "kommer ej rätta"
-#~ msgid "display merged bugs only once"
-#~ msgstr "visa endast hopslagna rapporter en gång"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "aktiva fel"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Flaggor:"
+#~ msgid "Include tag:"
+#~ msgstr "Inkludera märke:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Exkludera märke:"
diff --git a/swedish/po/distrib.sv.po b/swedish/po/distrib.sv.po
index 379e77048bc..da9627498fb 100644
--- a/swedish/po/distrib.sv.po
+++ b/swedish/po/distrib.sv.po
@@ -205,23 +205,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/swedish/po/doc.sv.po b/swedish/po/doc.sv.po
index 9469ae5293a..a26b97d9b0b 100644
--- a/swedish/po/doc.sv.po
+++ b/swedish/po/doc.sv.po
@@ -216,13 +216,13 @@ msgstr "(version <get-var version />)"
msgid "plain text"
msgstr "ren text"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
"Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a>-förrådet."
+"\"https://packages.debian.org/git\">Git</a>-förrådet."
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
@@ -250,14 +250,6 @@ msgstr ""
"Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
"\"https://packages.debian.org/subversion\">Subversion</a>-förrådet."
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
-"\"https://packages.debian.org/git\">Git</a>-förrådet."
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -288,229 +280,117 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Debian 2.2 ARM architecture"
-#~ msgstr "Debian 2.2 för ARM-arkitekturen"
-
-#~ msgid ""
-#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
-#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
-#~ "Psion5).\n"
-#~ " It also gives generic information, tools and techniques. The GNU\n"
-#~ " toolchain is covered in native and cross-compiler form, as are "
-#~ "bootloaders,\n"
-#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-#~ "also\n"
-#~ " includes extensive tutorial information on GNU/Linux basics for "
-#~ "developers\n"
-#~ " coming from other platforms.\n"
-#~ " It is not specific to Debian, but the Aleph\n"
-#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-#~ "you\n"
-#~ " will be working from this distribution and preferably have a Debian "
-#~ "based\n"
-#~ " host machine too."
-#~ msgstr ""
-#~ "Denna bok är för utvecklare som arbetar med GNU/Linux på ARM-"
-#~ "processorer.\n"
-#~ " Den täcker några enheter specifikt för att komma igång snabbt (LART,\n"
-#~ " Assabet, Psion5).\n"
-#~ " Den innehåller även allmän information om verktyg och tekniker.\n"
-#~ " GNU-verktygskedjan täcks, både i direkt och korskompilerande form,\n"
-#~ " tillsammans med startladdare, kärnpatchar, RAM-diskar, ARM-"
-#~ "specialiteter och\n"
-#~ " andra ARM-resurser.\n"
-#~ " Dessutom finns omfattande introduktioner om GNU/Linuxgrunder för "
-#~ "utvecklare\n"
-#~ " som kommer från andra plattformar.\n"
-#~ " Boken är inte skriven specifikt för Debian, men Aleph\n"
-#~ " ARMLinux-distributionen är nära baserad på Debian-ARM och det antas att "
-#~ "du\n"
-#~ " arbetar från den distributionen, och gärna har tillgång till en\n"
-#~ " Debianbaserad värdmaskin."
-
-#~ msgid ""
-#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-#~ "mode=viewone&amp;titnr=254925022\">\n"
-#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-#~ "29.95\n"
-#~ " euro (as of 2008)."
-#~ msgstr ""
-#~ "En alternativ\n"
-#~ " <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
-#~ "titnr=254925022\">\n"
-#~ " utgåva</a> finns hos Lehmanns Fachbuchhandlung och kostar 29,95 &euro;\n"
-#~ " (gäller 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Använd <a href=\"cvs\">Subversion</a> för att hämta SGML-källtexten för "
-#~ "<get-var ddp_pkg_loc />."
+#~ msgid "Sarge CD with installer and a selection of packages"
+#~ msgstr "Sarge-cd med installationsprogram och ett urval av paket"
-#~ msgid "Language:"
-#~ msgstr "Språk:"
+#~ msgid "Live CD with Knoppix"
+#~ msgstr "Live-cd med Knoppix"
#~ msgid ""
-#~ "This is the right book for you to learn how to create basic and complex "
-#~ "IT platforms using only Free Software. Inside it you will find a wide "
-#~ "range of procedures reviewed and adjusted to fit into the best practices "
-#~ "of technological infrastructure implementation. This easy to read and "
-#~ "comprehensive guide will take you by the hand to achieve specific "
-#~ "objectives with the Debian GNU/Linux operating system."
+#~ "Beginners and advanced users alike will find this book to be a\n"
+#~ " comprehensive source of information on using Debian for desktops,\n"
+#~ " intranet and internet servers, and development. It also contains\n"
+#~ " background information on the project and extensive coverage of\n"
+#~ " Debian's unique package management system."
#~ msgstr ""
-#~ "Det här är den rätta boken för dig för att lära sig hur skapar enkla och "
-#~ "komplexa IT-plattformar med hjälp av endast fri mjukvara. I den hittar du "
-#~ "ett brett utbud av förfaranden som granskats och justerats för att passa "
-#~ "din infrastrukturs teknologiska implementation. Denna lättlästa och "
-#~ "omfattande guide kommer att handleda dig till att nå specifika objektiv "
-#~ "med operativsystemet GNU/Linux."
+#~ "Denna bok är en omfattande informationskälla både för nybörjare och\n"
+#~ " avancerade användare. Den beskriver hur man använder Debian för\n"
+#~ " skrivbordssystem, intranät- och Internetservrar och utveckling, samt\n"
+#~ " bakgrundsinformation om projektet och utförlig information om\n"
+#~ " Debians unika pakethanteringssystem."
-#~ msgid ""
-#~ "This book is divided into four parts: Basic concepts, Management of\n"
-#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
-#~ "chapter\n"
-#~ " explains in depth the features of the operating system. The first\n"
-#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
-#~ " the reader to understand how the system uses basic resources such as\n"
-#~ " the processor and memory. A detailed analysis about filesystems such "
-#~ "as\n"
-#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
-#~ " for their needs. Many figures throughout the book show aspects about\n"
-#~ " the performance of the system. This book caters for college students\n"
-#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
-#~ " Debian Sarge."
-#~ msgstr ""
-#~ "Denna bok är indelad i fyra delar: grundläggande koncept, hantering av\n"
-#~ " GNU/Linux, systemadministrering och avancerad operation. Varje kapitel\n"
-#~ " förklarar i detalj de olika funktionerna i operativsystemet. De "
-#~ "första\n"
-#~ " kapitlen förklarar strukturen i GNU/Linux, dessa kapitel hjälper "
-#~ "läsaren\n"
-#~ " att förstå hur systemet använder grundläggande resurser, såsom "
-#~ "processorn\n"
-#~ " och minnet. En detaljerad analys om filsystem såsom Ext2, Ext3 och\n"
-#~ " ReiserFS gör det möjligt för användare att snabbt göra rätt val för "
-#~ "sina\n"
-#~ " behov. Många siffror i boken visar olika aspekter på systemets "
-#~ "prestanda.\n"
-#~ " Denna bok är avsedd för högskolestudenter och alla som vill lära sig\n"
-#~ " detaljer om GNU/Linux. Denna bok är skriven för Debian Sarge."
+#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+#~ msgstr "official Debian GNU/Linux 3.1r0a Sarge på dvd (i386)"
#~ msgid ""
-#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
-#~ " to install Debian GNU/Linux and set up network services like web,\n"
-#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
-#~ " using GNU/Linux and Debian's powerful package management system."
+#~ "This book introduces the concepts and techniques of the Debian\n"
+#~ " operating system, explaining their usage and pitfalls, and\n"
+#~ " illustrating the thinking behind each of the approaches. The goal is\n"
+#~ " not to be a reference book, but to give the reader enough insight\n"
+#~ " into the workings of the project and operating system to learn and\n"
+#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
+#~ " non-intuitive solutions that have evolved as part of the Debian\n"
+#~ " system over the past decade. While targeted at the well-versed\n"
+#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
+#~ " resource alongside a standard Linux reference to bootstrap one's\n"
+#~ " Linux experience in Debian's bottom-up philosophy."
#~ msgstr ""
-#~ "Den första persiska boken om Debian GNU/Linux.\n"
-#~ " Denna bok hjälper dig med att installera Debian GNU/Linux och ställa "
-#~ "in\n"
-#~ " nätverkstjänster såsom webb, databas, brandvägg, e-post, ftp, och så\n"
-#~ " vidare, på den.\n"
-#~ " Den hjälper dig även att börja använda GNU/Linux och Debians\n"
-#~ " kraftfulla pakethanteringssystem."
-
-#~ msgid "Debian GNU/Linux 3.1r0 CD1"
-#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
+#~ "Boken introducerar de koncept och tekniker som ingår i operativsystemet\n"
+#~ " Debian, förklarar dess användning och fallgropar och illustrerar "
+#~ "tänkesättet\n"
+#~ " bakom alla angreppsvinklar.\n"
+#~ " Målet är inte att vara en referensbok utan att ge läsaren tillräcklig "
+#~ "insikt i\n"
+#~ " hur projektet och operativsystemet fungerar för att lära sig omfamna "
+#~ "de\n"
+#~ " sofistikerade och eleganta, ibland vid första anblicken icke-intuitiva\n"
+#~ " lösningar som har växt fram som en del av Debiansystemet under det "
+#~ "senaste\n"
+#~ " årtiondet.\n"
+#~ " Trots att boken är riktad mot den väl bevandrade UNIX-/Linux-"
+#~ "administratören\n"
+#~ " kan den även fungera som en utmärkt referens tillsammans med en vanlig\n"
+#~ " Linuxreferens för att sätta fart på ens erfarenheter av Debians\n"
+#~ " botten-upp-filosofi."
#~ msgid ""
-#~ "This book introduces readers to Debian GNU/Linux with many\n"
-#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
-#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
-#~ " package installation, setting up X, connecting to Internet, network\n"
-#~ " maintenance, and more. This book provides a handful of tips on setting "
-#~ "up\n"
-#~ " Debian for Korean language environment, and it is good for newcomers, "
-#~ "too."
+#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+#~ "from\n"
+#~ " working with text, images, and sound to productivity and networking\n"
+#~ " issues. Like the software the book describes, the book is copylefted\n"
+#~ " and its source data is available."
#~ msgstr ""
-#~ "Denna bok introducerar läsaren till Debian GNU/Linux med många\n"
-#~ " handgripliga vägledningar och tips.\n"
-#~ " Skriven på koreanska täcker denna bok många aspekter av Debian\n"
-#~ " GNU/Linux-system: förstagångsinstallation, paketinstallation,\n"
-#~ " ställa in X, ansluta till Internet, nätverksunderhåll, och mer.\n"
-#~ " Denna bok ger ett antal tips på hur Debian ställs in för en\n"
-#~ " koreansk språkmiljö och är även bra för nybörjare."
-
-#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
-#~ msgstr "Tre officiella potato r3-cd-skivor och en inofficiell woody-cd"
+#~ "En handgriplig referensguide till Debian GNU/Linux-system som i över\n"
+#~ " 1500 <q>recept</q> visar hur man kan använda det till vardagliga\n"
+#~ " uppgifter &ndash; från att arbeta med text, bilder och ljud till\n"
+#~ " produktivitet och nätverksanvändning. Liksom programvaran den\n"
+#~ " beskriver är boken copyleftad och källkoden finns tillgänglig."
#~ msgid ""
-#~ "This book gives a brief guide to installation of Debian\n"
-#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
-#~ "and\n"
-#~ " maintenance of system and networking,\n"
-#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
-#~ " This book also includes a guide for maintainers, which stimulates\n"
-#~ " people in Korea to become official Debian maintainers."
+#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
+#~ " installation and configuration of Debian GNU/Linux.\n"
+#~ " Windows users will gain a gentle introduction to this exciting\n"
+#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
+#~ "q>."
#~ msgstr ""
-#~ "Denna bok ger en kortfattad vägledning för installation av Debian\n"
-#~ " GNU/Linux, grundläggande Unix- eller Linuxkommandon, grundläggande\n"
-#~ " konfiguration och underhåll av system och nätverk,\n"
-#~ " X Window System-inställning och multimedia i Debian GNU/Linux.\n"
-#~ " Denna bok innehåller även en guide för utvecklare,\n"
-#~ " vilket stimulerar personer i Korea\n"
-#~ " att bli nya officiella Debianutvecklare."
+#~ "Learning Debian GNU/Linux stegar den nye Linuxanvändaren genom "
+#~ "installation\n"
+#~ " och konfiguration av Debian GNU/Linux.\n"
+#~ " Windowsanvändare får en vänlig introduktion till detta spännande område "
+#~ "i\n"
+#~ " datorvärlden, guidad av Bill McCarty i <q>Learning Debian GNU/Linux</q>."
-#~ msgid "1 unofficial Woody, 3 Potato rev0"
-#~ msgstr "1 inofficiell Woody, 3 Potato rev0"
+#~ msgid "Debian 2.1"
+#~ msgstr "Debian 2.1"
#~ msgid ""
-#~ "This book covers general topics about Debian GNU/Linux:\n"
-#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
-#~ " administration, kernel setup, sharing with Windows, building servers\n"
-#~ " and so on.\n"
-#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
-#~ " environment very easily with the customized CDs."
+#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
+#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
+#~ "mail\n"
+#~ " support included."
#~ msgstr ""
-#~ "Denna bok täcker allmänna ämnen om Debian GNU/Linux:\n"
-#~ " Installation, APT och dpkg, skalet, X Window System, nätverk,\n"
-#~ " systemadministration, konfigurering av kärnan, delning med Windows,\n"
-#~ " bygga servrar och så vidare.\n"
-#~ " Du kommer kunna installera och börja använda Debian GNU/Linux'\n"
-#~ " japanska miljö väldigt enkelt via dess skräddarsydda cd-skivor."
+#~ "Innehåller drygt 230 sidor och tre cd-rom-skivor.\n"
+#~ " Bland de ämnen som avhandlas finns Debian Linux, nätverk,\n"
+#~ " programmeringsverktyg, grafiska användargränssnitt, datorstödd\n"
+#~ " trycksaksproduktion, affärsanvändning, skojiga prylar och multimedia.\n"
+#~ " 30 dagars gratis e-poststöd ingår."
-#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
-#~ msgstr "Debian 2.2r0 i386 författarens utgåva (3 cd)"
+#~ msgid "DVD Debian Squeeze i386/amd64"
+#~ msgstr "DVD Debian Squeeze i386/amd64"
-#~ msgid ""
-#~ "This is the latest book for Sarge of the series that has been\n"
-#~ " supported as a standard bible of Debian in Japan.\n"
-#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
-#~ " as installation, desktop environments, system administration, and\n"
-#~ " server configuration. Furthermore, this book also includes commercial\n"
-#~ " font package that decorates your desktop. This book might be useful\n"
-#~ " for all Debian users from beginners to advanced users."
-#~ msgstr ""
-#~ "Detta är den senaste boken för Sarge i en serie som har stötts som en\n"
-#~ " standardbibel för Debian i Japan.\n"
-#~ " Boken täcker alla infallsvinklar om att använda Debian GNU/Linux 3.1,\n"
-#~ " såsom installation, skrivbordsmiljöer, systemadministration och\n"
-#~ " serverkonfiguration.\n"
-#~ " Dessutom innehåller boken ett kommersiellt paket teckensnitt som "
-#~ "dekorerar\n"
-#~ " ditt skrivbord.\n"
-#~ " Boken kan vara användbar för alla Debiananvändare, från nybörjare till\n"
-#~ " avancerade användare."
+#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#~ msgstr "2 utgåvor: En utan dvd, den andra med 2 dvd:er (i386)"
-#~ msgid ""
-#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
-#~ " CD)"
-#~ msgstr "Debian GNU/Linux 3.1r0 i386, författarens utgåva (dvd + cd)"
+#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) på DVD"
#~ msgid ""
-#~ "This book is dictionary style and covers various tips for beginners\n"
-#~ " and intermediate skill users; installation via various ways,\n"
-#~ " desktop customize, troubleshooting, profitable knowhow and so on."
+#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
+#~ "sources)"
#~ msgstr ""
-#~ "Denna bok är i ordboksstil och täcker flera tips för nybörjare och "
-#~ "användare\n"
-#~ " på medelnivå; installation på olika sätt, skräddarsy skrivbordet, "
-#~ "felsökning,\n"
-#~ " viktiga kunskaper och så vidare."
-
-#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#~ msgstr "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ "två varianter: en utan och en med officiell cd (i386, contrib och källkod)"
#~ msgid ""
#~ "The book covers all steps of planning and installing Debian GNU/Linux on\n"
@@ -548,114 +428,233 @@ msgstr "PDF"
#~ "för\n"
#~ " Windowsbaserade klienter (Samba)."
+#~ msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+#~ msgstr "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+
#~ msgid ""
-#~ "2 editions: One with no CD, the other with Official CD (i386, contrib and "
-#~ "sources)"
+#~ "This book is dictionary style and covers various tips for beginners\n"
+#~ " and intermediate skill users; installation via various ways,\n"
+#~ " desktop customize, troubleshooting, profitable knowhow and so on."
#~ msgstr ""
-#~ "två varianter: en utan och en med officiell cd (i386, contrib och källkod)"
+#~ "Denna bok är i ordboksstil och täcker flera tips för nybörjare och "
+#~ "användare\n"
+#~ " på medelnivå; installation på olika sätt, skräddarsy skrivbordet, "
+#~ "felsökning,\n"
+#~ " viktiga kunskaper och så vidare."
-#~ msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
-#~ msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) på DVD"
+#~ msgid ""
+#~ "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+#~ " CD)"
+#~ msgstr "Debian GNU/Linux 3.1r0 i386, författarens utgåva (dvd + cd)"
-#~ msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-#~ msgstr "2 utgåvor: En utan dvd, den andra med 2 dvd:er (i386)"
+#~ msgid ""
+#~ "This is the latest book for Sarge of the series that has been\n"
+#~ " supported as a standard bible of Debian in Japan.\n"
+#~ " This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+#~ " as installation, desktop environments, system administration, and\n"
+#~ " server configuration. Furthermore, this book also includes commercial\n"
+#~ " font package that decorates your desktop. This book might be useful\n"
+#~ " for all Debian users from beginners to advanced users."
+#~ msgstr ""
+#~ "Detta är den senaste boken för Sarge i en serie som har stötts som en\n"
+#~ " standardbibel för Debian i Japan.\n"
+#~ " Boken täcker alla infallsvinklar om att använda Debian GNU/Linux 3.1,\n"
+#~ " såsom installation, skrivbordsmiljöer, systemadministration och\n"
+#~ " serverkonfiguration.\n"
+#~ " Dessutom innehåller boken ett kommersiellt paket teckensnitt som "
+#~ "dekorerar\n"
+#~ " ditt skrivbord.\n"
+#~ " Boken kan vara användbar för alla Debiananvändare, från nybörjare till\n"
+#~ " avancerade användare."
-#~ msgid "DVD Debian Squeeze i386/amd64"
-#~ msgstr "DVD Debian Squeeze i386/amd64"
+#~ msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+#~ msgstr "Debian 2.2r0 i386 författarens utgåva (3 cd)"
#~ msgid ""
-#~ "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
-#~ " include Debian Linux, networking, programming tools, GUI, desktop\n"
-#~ " publishing, business, fun things, and multimedia. 30 days of free e-"
-#~ "mail\n"
-#~ " support included."
+#~ "This book covers general topics about Debian GNU/Linux:\n"
+#~ " installation, APT and dpkg, shell, X Window System, networking, system\n"
+#~ " administration, kernel setup, sharing with Windows, building servers\n"
+#~ " and so on.\n"
+#~ " You will be able to install and start to use Debian GNU/Linux Japanese\n"
+#~ " environment very easily with the customized CDs."
#~ msgstr ""
-#~ "Innehåller drygt 230 sidor och tre cd-rom-skivor.\n"
-#~ " Bland de ämnen som avhandlas finns Debian Linux, nätverk,\n"
-#~ " programmeringsverktyg, grafiska användargränssnitt, datorstödd\n"
-#~ " trycksaksproduktion, affärsanvändning, skojiga prylar och multimedia.\n"
-#~ " 30 dagars gratis e-poststöd ingår."
+#~ "Denna bok täcker allmänna ämnen om Debian GNU/Linux:\n"
+#~ " Installation, APT och dpkg, skalet, X Window System, nätverk,\n"
+#~ " systemadministration, konfigurering av kärnan, delning med Windows,\n"
+#~ " bygga servrar och så vidare.\n"
+#~ " Du kommer kunna installera och börja använda Debian GNU/Linux'\n"
+#~ " japanska miljö väldigt enkelt via dess skräddarsydda cd-skivor."
-#~ msgid "Debian 2.1"
-#~ msgstr "Debian 2.1"
+#~ msgid "1 unofficial Woody, 3 Potato rev0"
+#~ msgstr "1 inofficiell Woody, 3 Potato rev0"
#~ msgid ""
-#~ "Learning Debian GNU/Linux guides the new user of Linux through the\n"
-#~ " installation and configuration of Debian GNU/Linux.\n"
-#~ " Windows users will gain a gentle introduction to this exciting\n"
-#~ " computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</"
-#~ "q>."
+#~ "This book gives a brief guide to installation of Debian\n"
+#~ " GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+#~ "and\n"
+#~ " maintenance of system and networking,\n"
+#~ " X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+#~ " This book also includes a guide for maintainers, which stimulates\n"
+#~ " people in Korea to become official Debian maintainers."
#~ msgstr ""
-#~ "Learning Debian GNU/Linux stegar den nye Linuxanvändaren genom "
-#~ "installation\n"
-#~ " och konfiguration av Debian GNU/Linux.\n"
-#~ " Windowsanvändare får en vänlig introduktion till detta spännande område "
-#~ "i\n"
-#~ " datorvärlden, guidad av Bill McCarty i <q>Learning Debian GNU/Linux</q>."
+#~ "Denna bok ger en kortfattad vägledning för installation av Debian\n"
+#~ " GNU/Linux, grundläggande Unix- eller Linuxkommandon, grundläggande\n"
+#~ " konfiguration och underhåll av system och nätverk,\n"
+#~ " X Window System-inställning och multimedia i Debian GNU/Linux.\n"
+#~ " Denna bok innehåller även en guide för utvecklare,\n"
+#~ " vilket stimulerar personer i Korea\n"
+#~ " att bli nya officiella Debianutvecklare."
+
+#~ msgid "Three official potato r3 CDs and an unofficial woody CD"
+#~ msgstr "Tre officiella potato r3-cd-skivor och en inofficiell woody-cd"
#~ msgid ""
-#~ "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
-#~ " in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
-#~ "from\n"
-#~ " working with text, images, and sound to productivity and networking\n"
-#~ " issues. Like the software the book describes, the book is copylefted\n"
-#~ " and its source data is available."
+#~ "This book introduces readers to Debian GNU/Linux with many\n"
+#~ " hands-on tutorials and tips. Written in Korean, this book covers\n"
+#~ " comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+#~ " package installation, setting up X, connecting to Internet, network\n"
+#~ " maintenance, and more. This book provides a handful of tips on setting "
+#~ "up\n"
+#~ " Debian for Korean language environment, and it is good for newcomers, "
+#~ "too."
#~ msgstr ""
-#~ "En handgriplig referensguide till Debian GNU/Linux-system som i över\n"
-#~ " 1500 <q>recept</q> visar hur man kan använda det till vardagliga\n"
-#~ " uppgifter &ndash; från att arbeta med text, bilder och ljud till\n"
-#~ " produktivitet och nätverksanvändning. Liksom programvaran den\n"
-#~ " beskriver är boken copyleftad och källkoden finns tillgänglig."
+#~ "Denna bok introducerar läsaren till Debian GNU/Linux med många\n"
+#~ " handgripliga vägledningar och tips.\n"
+#~ " Skriven på koreanska täcker denna bok många aspekter av Debian\n"
+#~ " GNU/Linux-system: förstagångsinstallation, paketinstallation,\n"
+#~ " ställa in X, ansluta till Internet, nätverksunderhåll, och mer.\n"
+#~ " Denna bok ger ett antal tips på hur Debian ställs in för en\n"
+#~ " koreansk språkmiljö och är även bra för nybörjare."
+
+#~ msgid "Debian GNU/Linux 3.1r0 CD1"
+#~ msgstr "Debian GNU/Linux 3.1r0 CD1"
#~ msgid ""
-#~ "This book introduces the concepts and techniques of the Debian\n"
-#~ " operating system, explaining their usage and pitfalls, and\n"
-#~ " illustrating the thinking behind each of the approaches. The goal is\n"
-#~ " not to be a reference book, but to give the reader enough insight\n"
-#~ " into the workings of the project and operating system to learn and\n"
-#~ " embrace the sophisticated and elegant, sometimes at first slightly\n"
-#~ " non-intuitive solutions that have evolved as part of the Debian\n"
-#~ " system over the past decade. While targeted at the well-versed\n"
-#~ " UNIX/Linux administrator, the book can also serve as an excellent\n"
-#~ " resource alongside a standard Linux reference to bootstrap one's\n"
-#~ " Linux experience in Debian's bottom-up philosophy."
+#~ "The first Persian book about Debian GNU/Linux. This book helps you\n"
+#~ " to install Debian GNU/Linux and set up network services like web,\n"
+#~ " database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+#~ " using GNU/Linux and Debian's powerful package management system."
#~ msgstr ""
-#~ "Boken introducerar de koncept och tekniker som ingår i operativsystemet\n"
-#~ " Debian, förklarar dess användning och fallgropar och illustrerar "
-#~ "tänkesättet\n"
-#~ " bakom alla angreppsvinklar.\n"
-#~ " Målet är inte att vara en referensbok utan att ge läsaren tillräcklig "
-#~ "insikt i\n"
-#~ " hur projektet och operativsystemet fungerar för att lära sig omfamna "
-#~ "de\n"
-#~ " sofistikerade och eleganta, ibland vid första anblicken icke-intuitiva\n"
-#~ " lösningar som har växt fram som en del av Debiansystemet under det "
-#~ "senaste\n"
-#~ " årtiondet.\n"
-#~ " Trots att boken är riktad mot den väl bevandrade UNIX-/Linux-"
-#~ "administratören\n"
-#~ " kan den även fungera som en utmärkt referens tillsammans med en vanlig\n"
-#~ " Linuxreferens för att sätta fart på ens erfarenheter av Debians\n"
-#~ " botten-upp-filosofi."
+#~ "Den första persiska boken om Debian GNU/Linux.\n"
+#~ " Denna bok hjälper dig med att installera Debian GNU/Linux och ställa "
+#~ "in\n"
+#~ " nätverkstjänster såsom webb, databas, brandvägg, e-post, ftp, och så\n"
+#~ " vidare, på den.\n"
+#~ " Den hjälper dig även att börja använda GNU/Linux och Debians\n"
+#~ " kraftfulla pakethanteringssystem."
-#~ msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
-#~ msgstr "official Debian GNU/Linux 3.1r0a Sarge på dvd (i386)"
+#~ msgid ""
+#~ "This book is divided into four parts: Basic concepts, Management of\n"
+#~ " GNU/Linux, Administration of the system and Advanced operations. Each "
+#~ "chapter\n"
+#~ " explains in depth the features of the operating system. The first\n"
+#~ " chapters explain the structure of GNU/Linux. These chapters will help\n"
+#~ " the reader to understand how the system uses basic resources such as\n"
+#~ " the processor and memory. A detailed analysis about filesystems such "
+#~ "as\n"
+#~ " Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+#~ " for their needs. Many figures throughout the book show aspects about\n"
+#~ " the performance of the system. This book caters for college students\n"
+#~ " and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+#~ " Debian Sarge."
+#~ msgstr ""
+#~ "Denna bok är indelad i fyra delar: grundläggande koncept, hantering av\n"
+#~ " GNU/Linux, systemadministrering och avancerad operation. Varje kapitel\n"
+#~ " förklarar i detalj de olika funktionerna i operativsystemet. De "
+#~ "första\n"
+#~ " kapitlen förklarar strukturen i GNU/Linux, dessa kapitel hjälper "
+#~ "läsaren\n"
+#~ " att förstå hur systemet använder grundläggande resurser, såsom "
+#~ "processorn\n"
+#~ " och minnet. En detaljerad analys om filsystem såsom Ext2, Ext3 och\n"
+#~ " ReiserFS gör det möjligt för användare att snabbt göra rätt val för "
+#~ "sina\n"
+#~ " behov. Många siffror i boken visar olika aspekter på systemets "
+#~ "prestanda.\n"
+#~ " Denna bok är avsedd för högskolestudenter och alla som vill lära sig\n"
+#~ " detaljer om GNU/Linux. Denna bok är skriven för Debian Sarge."
#~ msgid ""
-#~ "Beginners and advanced users alike will find this book to be a\n"
-#~ " comprehensive source of information on using Debian for desktops,\n"
-#~ " intranet and internet servers, and development. It also contains\n"
-#~ " background information on the project and extensive coverage of\n"
-#~ " Debian's unique package management system."
+#~ "This is the right book for you to learn how to create basic and complex "
+#~ "IT platforms using only Free Software. Inside it you will find a wide "
+#~ "range of procedures reviewed and adjusted to fit into the best practices "
+#~ "of technological infrastructure implementation. This easy to read and "
+#~ "comprehensive guide will take you by the hand to achieve specific "
+#~ "objectives with the Debian GNU/Linux operating system."
#~ msgstr ""
-#~ "Denna bok är en omfattande informationskälla både för nybörjare och\n"
-#~ " avancerade användare. Den beskriver hur man använder Debian för\n"
-#~ " skrivbordssystem, intranät- och Internetservrar och utveckling, samt\n"
-#~ " bakgrundsinformation om projektet och utförlig information om\n"
-#~ " Debians unika pakethanteringssystem."
+#~ "Det här är den rätta boken för dig för att lära sig hur skapar enkla och "
+#~ "komplexa IT-plattformar med hjälp av endast fri mjukvara. I den hittar du "
+#~ "ett brett utbud av förfaranden som granskats och justerats för att passa "
+#~ "din infrastrukturs teknologiska implementation. Denna lättlästa och "
+#~ "omfattande guide kommer att handleda dig till att nå specifika objektiv "
+#~ "med operativsystemet GNU/Linux."
-#~ msgid "Live CD with Knoppix"
-#~ msgstr "Live-cd med Knoppix"
+#~ msgid "Language:"
+#~ msgstr "Språk:"
-#~ msgid "Sarge CD with installer and a selection of packages"
-#~ msgstr "Sarge-cd med installationsprogram och ett urval av paket"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Använd <a href=\"cvs\">Subversion</a> för att hämta SGML-källtexten för "
+#~ "<get-var ddp_pkg_loc />."
+
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "En alternativ\n"
+#~ " <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
+#~ "titnr=254925022\">\n"
+#~ " utgåva</a> finns hos Lehmanns Fachbuchhandlung och kostar 29,95 &euro;\n"
+#~ " (gäller 2008)."
+
+#~ msgid ""
+#~ "This book is for developers working with GNU/Linux on ARM processors.\n"
+#~ " It covers some devices specifically for quick set-up (LART, Assabet, "
+#~ "Psion5).\n"
+#~ " It also gives generic information, tools and techniques. The GNU\n"
+#~ " toolchain is covered in native and cross-compiler form, as are "
+#~ "bootloaders,\n"
+#~ " kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+#~ "also\n"
+#~ " includes extensive tutorial information on GNU/Linux basics for "
+#~ "developers\n"
+#~ " coming from other platforms.\n"
+#~ " It is not specific to Debian, but the Aleph\n"
+#~ " ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+#~ "you\n"
+#~ " will be working from this distribution and preferably have a Debian "
+#~ "based\n"
+#~ " host machine too."
+#~ msgstr ""
+#~ "Denna bok är för utvecklare som arbetar med GNU/Linux på ARM-"
+#~ "processorer.\n"
+#~ " Den täcker några enheter specifikt för att komma igång snabbt (LART,\n"
+#~ " Assabet, Psion5).\n"
+#~ " Den innehåller även allmän information om verktyg och tekniker.\n"
+#~ " GNU-verktygskedjan täcks, både i direkt och korskompilerande form,\n"
+#~ " tillsammans med startladdare, kärnpatchar, RAM-diskar, ARM-"
+#~ "specialiteter och\n"
+#~ " andra ARM-resurser.\n"
+#~ " Dessutom finns omfattande introduktioner om GNU/Linuxgrunder för "
+#~ "utvecklare\n"
+#~ " som kommer från andra plattformar.\n"
+#~ " Boken är inte skriven specifikt för Debian, men Aleph\n"
+#~ " ARMLinux-distributionen är nära baserad på Debian-ARM och det antas att "
+#~ "du\n"
+#~ " arbetar från den distributionen, och gärna har tillgång till en\n"
+#~ " Debianbaserad värdmaskin."
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Debian 2.2 för ARM-arkitekturen"
+
+#~ msgid ""
+#~ "The latest <get-var srctype /> source is available through the <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+#~ msgstr ""
+#~ "Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
+#~ "\"https://www.debian.org/doc/cvs\">Subversion</a>-förrådet."
diff --git a/swedish/po/mailinglists.sv.po b/swedish/po/mailinglists.sv.po
index bbf5da1d40a..dbaab6d79be 100644
--- a/swedish/po/mailinglists.sv.po
+++ b/swedish/po/mailinglists.sv.po
@@ -130,8 +130,8 @@ msgstr "öppen"
msgid "closed"
msgstr "stängd"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Välj vilka listor du vill prenumerera på:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Välj de listor du vill avbeställa:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Välj vilka listor du vill prenumerera på:"
diff --git a/swedish/po/organization.sv.po b/swedish/po/organization.sv.po
index 43d807a6232..0b92cd41bfb 100644
--- a/swedish/po/organization.sv.po
+++ b/swedish/po/organization.sv.po
@@ -78,22 +78,22 @@ msgid "Officers"
msgstr "Tjänstemän"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Distributionen"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr "Kommunikation och Utåtriktad verksamhet"
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Publicitetsgruppen"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Support och infrastruktur"
@@ -110,179 +110,179 @@ msgstr "Arbetsledare"
msgid "Technical Committee"
msgstr "Teknisk kommitté"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekreterare"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Utvecklingsprojekt"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Ftp-arkiv"
-#: ../../english/intro/organization.data:88
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Ftp-assistenter"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "FTP Wizards"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Backports-teamet"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Individuella paket"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Samordning av nya utgåvor"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Utgivningsgruppen"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Kvalitetsstyrning"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Installationssystemgruppen"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Versionsfakta"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Cd-avbildningsfiler"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Testning"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Infrastruktur för automatiska byggen"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Vill-bygga-gruppen"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Byggserveradministration"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Dokumentation"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Paket med behov av arbete samt framtida paket"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:183
msgid "Debian Live Team"
msgstr "Debian Live-gruppen"
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Anpassningar"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Speciella system"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Bärbara"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Brandväggar"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Inbyggda system"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Presskontakt"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Webbsidor"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Outreach"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Debian Women-projektet"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Anti-trakasserier"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Evenemang"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "DebConf-kommitté"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Partnerprogrammet"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Samordning av maskinvarudonationer"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Användarstöd"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Felrapporteringssystem"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Sändlisteadministration och -arkiv"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Nymedlemsreceptionen"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Debiankontoadministratörer"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -290,31 +290,31 @@ msgstr ""
"För att skicka ett privatmeddelande till alla DAMs, använd GPG-nyckeln "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Ansvariga för nyckelring (PGP och GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Säkerhetsgrupp"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Konsultsida"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Cd-försäljarsida"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Policy"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Systemadministration"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -323,7 +323,7 @@ msgstr ""
"datorer, inklusive lösenordsproblem, eller om du behöver få ett paket "
"installerat."
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -333,107 +333,107 @@ msgstr ""
"db.debian.org/machines.cgi\">Debianmaskinsidan</a>, vilken innehåller "
"information om administratörer för varje enskild maskin."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Administratör för LDAP-utvecklarkatalogen"
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Speglingar"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS-ansvarig"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Paketspårningssystem"
-#: ../../english/intro/organization.data:441
+#: ../../english/intro/organization.data:444
msgid "Treasurer"
msgstr "Kassör"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:450
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:450
+#: ../../english/intro/organization.data:453
msgid "Salsa administrators"
msgstr "Salsaadministratörer"
-#: ../../english/intro/organization.data:454
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Administratörer för Alioth"
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian för barn mellan 1 och 99"
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian för medicinsk praktik och forskning"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian för utbildning"
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian för juridiska firmor"
# Politiskt korrekt? :-)
-#: ../../english/intro/organization.data:482
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian för personer med funktionsnedsättningar"
-#: ../../english/intro/organization.data:486
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian för vetenskap och forskning"
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:492
msgid "Debian for astronomy"
msgstr "Debian för astronomi"
-#~ msgid "Bits from Debian"
-#~ msgstr "Bitar från Debian"
-
-#~ msgid "DebConf chairs"
-#~ msgstr "Debconf-ledare"
+#~ msgid "Live System Team"
+#~ msgstr "Livesystem-gruppen"
-#~ msgid "Testing Security Team"
-#~ msgstr "Uttestningsutgåvans säkerhetsgrupp"
+#~ msgid "Auditor"
+#~ msgstr "Revisor"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projekt för säkerhetsgenomgång"
+#~ msgid "Publicity"
+#~ msgstr "PR"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Samordning av nyckelsignering"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Ansvariga för nyckelringen för Debian Maintainers (DM)"
-#~ msgid "Marketing Team"
-#~ msgstr "Marknadsföringsgrupp"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Debians nuvarande projektledare"
-#~ msgid "Handhelds"
-#~ msgstr "Handhållna"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatilegruppen"
#~ msgid "Vendors"
#~ msgstr "Försäljare"
-#~ msgid "Volatile Team"
-#~ msgstr "Volatilegruppen"
+#~ msgid "Handhelds"
+#~ msgstr "Handhållna"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Debians nuvarande projektledare"
+#~ msgid "Marketing Team"
+#~ msgstr "Marknadsföringsgrupp"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Ansvariga för nyckelringen för Debian Maintainers (DM)"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Samordning av nyckelsignering"
-#~ msgid "Publicity"
-#~ msgstr "PR"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt för säkerhetsgenomgång"
-#~ msgid "Auditor"
-#~ msgstr "Revisor"
+#~ msgid "Testing Security Team"
+#~ msgstr "Uttestningsutgåvans säkerhetsgrupp"
-#~ msgid "Live System Team"
-#~ msgstr "Livesystem-gruppen"
+#~ msgid "DebConf chairs"
+#~ msgstr "Debconf-ledare"
+
+#~ msgid "Bits from Debian"
+#~ msgstr "Bitar från Debian"
diff --git a/swedish/po/others.sv.po b/swedish/po/others.sv.po
index 2a060f646fc..e7953502a50 100644
--- a/swedish/po/others.sv.po
+++ b/swedish/po/others.sv.po
@@ -335,17 +335,17 @@ msgstr "Version"
msgid "URL"
msgstr "Webbadress"
-#~ msgid "Where:"
-#~ msgstr "Plats:"
+#~ msgid "Wanted:"
+#~ msgstr "Önskas:"
-#~ msgid "Specifications:"
-#~ msgstr "Specifikationer:"
+#~ msgid "Who:"
+#~ msgstr "Av:"
#~ msgid "Architecture:"
#~ msgstr "Arkitektur:"
-#~ msgid "Who:"
-#~ msgstr "Av:"
+#~ msgid "Specifications:"
+#~ msgstr "Specifikationer:"
-#~ msgid "Wanted:"
-#~ msgstr "Önskas:"
+#~ msgid "Where:"
+#~ msgstr "Plats:"
diff --git a/swedish/po/partners.sv.po b/swedish/po/partners.sv.po
index ed4871e3ad2..de6f6745d6d 100644
--- a/swedish/po/partners.sv.po
+++ b/swedish/po/partners.sv.po
@@ -665,6 +665,16 @@ msgstr ""
"skeppas med öppen källkodsverktyg och operativsystem."
#~ msgid ""
+#~ "credativ is a service oriented company focusing on open-source software "
+#~ "since its foundation in 1999. World-wide Debian support is provided by "
+#~ "credativ's <q>Open Source Support Centers</q> around the globe."
+#~ msgstr ""
+#~ "credativ är ett tjänsteorienterat företag med fokus på mjukvara med öppen "
+#~ "källkod sedan dess grundande i 1999. Världsomspännande Debiansupport "
+#~ "tillhandahålls genom credativ's <q>Open Source Support Centers</q> runt "
+#~ "hela världen."
+
+#~ msgid ""
#~ "A large number of credativ staff are Debian developers, several of them "
#~ "very well know in the community. From the very beginning credativ has "
#~ "actively supported the Debian project. For more information please visit "
@@ -674,13 +684,3 @@ msgstr ""
#~ "välkända inom gemenskapen. Från början har credativ aktiv stött "
#~ "Debianprojektet.För ytterligare inforamtion, besök <url \"http://www."
#~ "credativ.com/\">."
-
-#~ msgid ""
-#~ "credativ is a service oriented company focusing on open-source software "
-#~ "since its foundation in 1999. World-wide Debian support is provided by "
-#~ "credativ's <q>Open Source Support Centers</q> around the globe."
-#~ msgstr ""
-#~ "credativ är ett tjänsteorienterat företag med fokus på mjukvara med öppen "
-#~ "källkod sedan dess grundande i 1999. Världsomspännande Debiansupport "
-#~ "tillhandahålls genom credativ's <q>Open Source Support Centers</q> runt "
-#~ "hela världen."
diff --git a/swedish/po/ports.sv.po b/swedish/po/ports.sv.po
index b0c977c666c..90d2bf62d45 100644
--- a/swedish/po/ports.sv.po
+++ b/swedish/po/ports.sv.po
@@ -114,32 +114,32 @@ msgstr "Debian för PowerPC"
msgid "Debian for Sparc"
msgstr "Debian för Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian för bärbara"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian för AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian för Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian för ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian för S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian för Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian för MIPS"
-#~ msgid "Main"
-#~ msgstr "Huvudsida"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian för Motorola 680x0"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian för Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Huvudsida"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian för MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian för Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian för S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian för ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian för Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian för AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian för bärbara"
diff --git a/swedish/po/stats.sv.po b/swedish/po/stats.sv.po
index b6db8cf95db..e72b8881621 100644
--- a/swedish/po/stats.sv.po
+++ b/swedish/po/stats.sv.po
@@ -28,79 +28,90 @@ msgstr "Det finns %d bytes att översätta."
msgid "There are %d strings to translate."
msgstr "Det finns %d strängar att översätta."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Den här översättningen är föråldrad"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Felaktig översättningsversion"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Den här översättningen är föråldrad"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Originalet är nyare än denna översättning"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Originalet finns inte längre"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "träffräknare N/A"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "träffar"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Klicka för att hämta diffstat-data"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Samlad diff"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Färglagd diff"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Färglagd diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Skapad med <transstatslink>"
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Översättningssammanfattning för"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Ej översatt"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Föråldrade"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Översatt"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Uppdaterade"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "filer"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "bytes"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -108,131 +119,131 @@ msgstr ""
"Observera: listorna på den här sidan sorteras efter popularitet. Hovra över "
"sidnamnet för att se antal träffar."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Föråldrade översättningar"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Fil"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Kommentar"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Logg"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Översättning"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Underhållare"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Översättare"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Datum"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Generella sidor ej översatta"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Ej översatta generella sidor"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Nyheter som inte översatts"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Oöversatta nyheter"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Konsult/användarsidor som inte översatts"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Ej översatta Konsult/användarsidor"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Internationella sidor som ej översatts"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Ej översatta internationella sidor"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Översatta sidor (uppdaterade)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Översatta mallar (PO-filer)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Statistik för PO-översättningar"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Luddig"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Ej översatt"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Totalt"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Totalt:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Översatta webbsidor"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Översättningsstatistik efter antal sidor"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Språk"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Översättningar"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Översatta webbsidor (efter storlek)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Översättningsstatistik efter sidstorlek"
diff --git a/swedish/po/templates.sv.po b/swedish/po/templates.sv.po
index 73c223f902a..8134086eede 100644
--- a/swedish/po/templates.sv.po
+++ b/swedish/po/templates.sv.po
@@ -200,12 +200,19 @@ msgstr "i utgåva 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"För att rapportera ett problem med webbplatsen, kontakta vår publikt "
"arkiverade sändlista <a href=\"mailto:debian-www@lists.debian.org\">debian-"
@@ -505,6 +512,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Observera:</em> Originalet existerar inte längre."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "Webbadress"
diff --git a/swedish/po/vendors.sv.po b/swedish/po/vendors.sv.po
index d1a9b169ac9..4394755a171 100644
--- a/swedish/po/vendors.sv.po
+++ b/swedish/po/vendors.sv.po
@@ -65,74 +65,74 @@ msgstr "källkod"
msgid "and"
msgstr "och"
-#~ msgid "updated monthly"
-#~ msgstr "uppdateras månadsvis"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "uppdateras två gånger i veckan"
+#~ msgid "Vendor:"
+#~ msgstr "Distributör:"
-#~ msgid "updated weekly"
-#~ msgstr "uppdateras veckovis"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Webbadress för Debiansida:"
-#~ msgid "reseller"
-#~ msgstr "återförsäljare"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tillåter bidrag till Debian:"
-#~ msgid "reseller of $var"
-#~ msgstr "återförsäljare för $var"
+#~ msgid "Country:"
+#~ msgstr "Land:"
-#~ msgid "Custom Release"
-#~ msgstr "Specialgjord version"
+#~ msgid "Ship International:"
+#~ msgstr "Levererar internationellt:"
-#~ msgid "vendor additions"
-#~ msgstr "distributörtillägg"
+#~ msgid "email:"
+#~ msgstr "E-post:"
-#~ msgid "contrib included"
-#~ msgstr "inkluderar contrib-delen"
+#~ msgid "CD Type:"
+#~ msgstr "Typ av cd:"
-#~ msgid "non-free included"
-#~ msgstr "inkluderar non-free-delen"
+#~ msgid "DVD Type:"
+#~ msgstr "Typ av dvd:"
-#~ msgid "non-US included"
-#~ msgstr "inkluderar non-US-delen"
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Samdistribuerad"
+#~ msgid "Official CD"
+#~ msgstr "Officiell cd"
-#~ msgid "Vendor Release"
-#~ msgstr "Distributörspecifik version"
+#~ msgid "Official DVD"
+#~ msgstr "Officiell dvd"
#~ msgid "Development Snapshot"
#~ msgstr "Utvecklarversion"
-#~ msgid "Official DVD"
-#~ msgstr "Officiell dvd"
+#~ msgid "Vendor Release"
+#~ msgstr "Distributörspecifik version"
-#~ msgid "Official CD"
-#~ msgstr "Officiell cd"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Samdistribuerad"
-#~ msgid "Architectures:"
-#~ msgstr "Arkitekturer:"
+#~ msgid "non-US included"
+#~ msgstr "inkluderar non-US-delen"
-#~ msgid "DVD Type:"
-#~ msgstr "Typ av dvd:"
+#~ msgid "non-free included"
+#~ msgstr "inkluderar non-free-delen"
-#~ msgid "CD Type:"
-#~ msgstr "Typ av cd:"
+#~ msgid "contrib included"
+#~ msgstr "inkluderar contrib-delen"
-#~ msgid "email:"
-#~ msgstr "E-post:"
+#~ msgid "vendor additions"
+#~ msgstr "distributörtillägg"
-#~ msgid "Ship International:"
-#~ msgstr "Levererar internationellt:"
+#~ msgid "Custom Release"
+#~ msgstr "Specialgjord version"
-#~ msgid "Country:"
-#~ msgstr "Land:"
+#~ msgid "reseller of $var"
+#~ msgstr "återförsäljare för $var"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Tillåter bidrag till Debian:"
+#~ msgid "reseller"
+#~ msgstr "återförsäljare"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Webbadress för Debiansida:"
+#~ msgid "updated weekly"
+#~ msgstr "uppdateras veckovis"
-#~ msgid "Vendor:"
-#~ msgstr "Distributör:"
+#~ msgid "updated twice weekly"
+#~ msgstr "uppdateras två gånger i veckan"
+
+#~ msgid "updated monthly"
+#~ msgstr "uppdateras månadsvis"
diff --git a/tamil/po/blends.ta.po b/tamil/po/blends.ta.po
index 64b8c15bf29..b00934651af 100644
--- a/tamil/po/blends.ta.po
+++ b/tamil/po/blends.ta.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/tamil/po/bugs.ta.po b/tamil/po/bugs.ta.po
index 70189c3ec38..e3ec8da3cb9 100644
--- a/tamil/po/bugs.ta.po
+++ b/tamil/po/bugs.ta.po
@@ -170,152 +170,152 @@ msgstr "களையப் பட்ட வழுக்கள்"
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "Flags:"
-#~ msgstr "குறிகள்:"
-
-#~ msgid "active bugs"
-#~ msgstr "களையப்படா வழுக்கள்"
+#~ msgid "Exclude tag:"
+#~ msgstr "விலக்குவதற்கான அடைகுறி:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "ஒன்றிணைக்கப்பட்ட பிழைகளை ஒரு முறை மட்டும் காட்டுக"
+#~ msgid "Include tag:"
+#~ msgstr "சேர்ப்பதற்கான அடைகுறி: "
-#~ msgid "no ordering by status or severity"
-#~ msgstr "நிலை மற்றும் முன்னுரிமை வாரியாக வரிசைப் படுத்துவது இல்லை"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "தலைகுறிப்பில்பில் அட்டவணையைக் காட்டாதே"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "அடிக்குறிப்பில் புள்ளிவிவரங்களைக் காட்டாதே"
+#~ msgid "wontfix"
+#~ msgstr "தீர்க்கப்படாத"
-#~ msgid "proposed-updates"
-#~ msgstr "பரிந்துரைக்கப்பட்ப புதுமைகள்"
+#~ msgid "upstream"
+#~ msgstr "மூலவிடம்"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "சோதனையின் போது பரிந்துரைக்கப்பட்ட புதியவை"
+#~ msgid "unreproducible"
+#~ msgstr "மீட்கவியலாது"
-#~ msgid "Package version:"
-#~ msgstr "பொதி வெளியீடு:"
+#~ msgid "security"
+#~ msgstr "அரண்"
-#~ msgid "Distribution:"
-#~ msgstr "வழங்கல்:"
+#~ msgid "patch"
+#~ msgstr "தீர்வை"
-#~ msgid "bugs"
-#~ msgstr "வழுக்கள்"
+#~ msgid "moreinfo"
+#~ msgstr "மேலும் தகவலுக்கு"
-#~ msgid "open"
-#~ msgstr "திறக்க"
+#~ msgid "l10n"
+#~ msgstr "தன்மொழியாக்கம்"
-#~ msgid "forwarded"
-#~ msgstr "வழியனுப்பபட்ட"
+#~ msgid "help"
+#~ msgstr "உதவி"
-#~ msgid "pending"
-#~ msgstr "மீதமுள்ள"
+#~ msgid "fixed-upstream"
+#~ msgstr "மூலவிடத்தில் சரிசெய்யபட்டது"
-#~ msgid "fixed"
-#~ msgstr "களையப்பட்ட"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "சோதனை வெளியீட்டில் சரிசெய்யப் பட்டது"
-#~ msgid "done"
-#~ msgstr "பூர்த்திசெய்யப்பட்ட"
+#~ msgid "d-i"
+#~ msgstr "டெ-நி"
-#~ msgid "Include status:"
-#~ msgstr "நிலைமையை உள்ளடக்குக:"
+#~ msgid "confirmed"
+#~ msgstr "உறுதிசெய்யப்பட்ட"
-#~ msgid "Exclude status:"
-#~ msgstr "நிலைமையை உள்ளடக்க வேண்டா:"
+#~ msgid "sid"
+#~ msgstr "சிட்"
-#~ msgid "critical"
-#~ msgstr "அவசியமான"
+#~ msgid "lenny-ignore"
+#~ msgstr "லென்னி-தவிர்"
-#~ msgid "grave"
-#~ msgstr "அத்தியாவசியமான"
+#~ msgid "lenny"
+#~ msgstr "லென்னி"
-#~ msgid "serious"
-#~ msgstr "அதிமுக்கியமான"
+#~ msgid "etch-ignore"
+#~ msgstr "எட்ச்-தவிர்"
-#~ msgid "important"
-#~ msgstr "முக்கியமாக"
+#~ msgid "etch"
+#~ msgstr "எட்ச்"
-#~ msgid "minor"
-#~ msgstr "சிறிய"
+#~ msgid "sarge-ignore"
+#~ msgstr "சார்ஜ்-தவிர்"
-#~ msgid "wishlist"
-#~ msgstr "அவாப்பட்டியல்"
+#~ msgid "woody"
+#~ msgstr "ஊடி"
-#~ msgid "Include severity:"
-#~ msgstr "முன்னுரிமையை சேர்க்க:"
+#~ msgid "potato"
+#~ msgstr "பொடேடோ"
#~ msgid "Exclude severity:"
#~ msgstr "முன்னுரிமையை விலக்குக:"
-#~ msgid "potato"
-#~ msgstr "பொடேடோ"
+#~ msgid "Include severity:"
+#~ msgstr "முன்னுரிமையை சேர்க்க:"
-#~ msgid "woody"
-#~ msgstr "ஊடி"
+#~ msgid "wishlist"
+#~ msgstr "அவாப்பட்டியல்"
-#~ msgid "sarge-ignore"
-#~ msgstr "சார்ஜ்-தவிர்"
+#~ msgid "minor"
+#~ msgstr "சிறிய"
-#~ msgid "etch"
-#~ msgstr "எட்ச்"
+#~ msgid "important"
+#~ msgstr "முக்கியமாக"
-#~ msgid "etch-ignore"
-#~ msgstr "எட்ச்-தவிர்"
+#~ msgid "serious"
+#~ msgstr "அதிமுக்கியமான"
-#~ msgid "lenny"
-#~ msgstr "லென்னி"
+#~ msgid "grave"
+#~ msgstr "அத்தியாவசியமான"
-#~ msgid "lenny-ignore"
-#~ msgstr "லென்னி-தவிர்"
+#~ msgid "critical"
+#~ msgstr "அவசியமான"
-#~ msgid "sid"
-#~ msgstr "சிட்"
+#~ msgid "Exclude status:"
+#~ msgstr "நிலைமையை உள்ளடக்க வேண்டா:"
-#~ msgid "confirmed"
-#~ msgstr "உறுதிசெய்யப்பட்ட"
+#~ msgid "Include status:"
+#~ msgstr "நிலைமையை உள்ளடக்குக:"
-#~ msgid "d-i"
-#~ msgstr "டெ-நி"
+#~ msgid "done"
+#~ msgstr "பூர்த்திசெய்யப்பட்ட"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "சோதனை வெளியீட்டில் சரிசெய்யப் பட்டது"
+#~ msgid "fixed"
+#~ msgstr "களையப்பட்ட"
-#~ msgid "fixed-upstream"
-#~ msgstr "மூலவிடத்தில் சரிசெய்யபட்டது"
+#~ msgid "pending"
+#~ msgstr "மீதமுள்ள"
-#~ msgid "help"
-#~ msgstr "உதவி"
+#~ msgid "forwarded"
+#~ msgstr "வழியனுப்பபட்ட"
-#~ msgid "l10n"
-#~ msgstr "தன்மொழியாக்கம்"
+#~ msgid "open"
+#~ msgstr "திறக்க"
-#~ msgid "moreinfo"
-#~ msgstr "மேலும் தகவலுக்கு"
+#~ msgid "bugs"
+#~ msgstr "வழுக்கள்"
-#~ msgid "patch"
-#~ msgstr "தீர்வை"
+#~ msgid "Distribution:"
+#~ msgstr "வழங்கல்:"
-#~ msgid "security"
-#~ msgstr "அரண்"
+#~ msgid "Package version:"
+#~ msgstr "பொதி வெளியீடு:"
-#~ msgid "unreproducible"
-#~ msgstr "மீட்கவியலாது"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "சோதனையின் போது பரிந்துரைக்கப்பட்ட புதியவை"
-#~ msgid "upstream"
-#~ msgstr "மூலவிடம்"
+#~ msgid "proposed-updates"
+#~ msgstr "பரிந்துரைக்கப்பட்ப புதுமைகள்"
-#~ msgid "wontfix"
-#~ msgstr "தீர்க்கப்படாத"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "அடிக்குறிப்பில் புள்ளிவிவரங்களைக் காட்டாதே"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "தலைகுறிப்பில்பில் அட்டவணையைக் காட்டாதே"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "நிலை மற்றும் முன்னுரிமை வாரியாக வரிசைப் படுத்துவது இல்லை"
-#~ msgid "Include tag:"
-#~ msgstr "சேர்ப்பதற்கான அடைகுறி: "
+#~ msgid "display merged bugs only once"
+#~ msgstr "ஒன்றிணைக்கப்பட்ட பிழைகளை ஒரு முறை மட்டும் காட்டுக"
-#~ msgid "Exclude tag:"
-#~ msgstr "விலக்குவதற்கான அடைகுறி:"
+#~ msgid "active bugs"
+#~ msgstr "களையப்படா வழுக்கள்"
+
+#~ msgid "Flags:"
+#~ msgstr "குறிகள்:"
diff --git a/tamil/po/distrib.ta.po b/tamil/po/distrib.ta.po
index e23ca45b190..947097eca29 100644
--- a/tamil/po/distrib.ta.po
+++ b/tamil/po/distrib.ta.po
@@ -211,8 +211,8 @@ msgstr ""
msgid "SPARC"
msgstr "ஸ்பார்க்"
-#~ msgid "Intel x86"
-#~ msgstr "இன்டல் எக்ஸ்86"
-
#~ msgid "AMD64"
#~ msgstr "ஏஎம்டி64"
+
+#~ msgid "Intel x86"
+#~ msgstr "இன்டல் எக்ஸ்86"
diff --git a/tamil/po/doc.ta.po b/tamil/po/doc.ta.po
index 26e701dbab6..4fb699e1587 100644
--- a/tamil/po/doc.ta.po
+++ b/tamil/po/doc.ta.po
@@ -29,8 +29,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -54,31 +54,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -90,7 +66,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -102,7 +78,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -110,6 +86,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "இயற்றியவர்:"
@@ -162,10 +154,10 @@ msgstr "(வெளியீடு <get-var version />)"
msgid "plain text"
msgstr "வெற்று உரை"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -190,12 +182,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -228,6 +214,9 @@ msgstr ""
msgid "PDF"
msgstr ""
+#~ msgid "Language:"
+#~ msgstr "மொழி:"
+
#, fuzzy
#~| msgid ""
#~| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-"
@@ -238,6 +227,3 @@ msgstr ""
#~ msgstr ""
#~ "<a href=\"cvs\">சிவிஎஸ்</a> பயன்படுத்தி <get-var ddp_pkg_loc /> க்கான "
#~ "எஸ்ஜிஎம்எல் மூல் உரைகளை பதிவிறக்குக. "
-
-#~ msgid "Language:"
-#~ msgstr "மொழி:"
diff --git a/tamil/po/mailinglists.ta.po b/tamil/po/mailinglists.ta.po
index 327d26341c4..2d719558162 100644
--- a/tamil/po/mailinglists.ta.po
+++ b/tamil/po/mailinglists.ta.po
@@ -121,8 +121,8 @@ msgstr "திறக்க"
msgid "closed"
msgstr "மூடுகக்க"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "தாங்கள் சேர விழையும் மடலாடற் குழுக்களை தேர்வு செய்க:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "தாங்கள் விலக விரும்மும் மடலாடற் குழுக்களைத் தேர்வு செய்க:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "தாங்கள் சேர விழையும் மடலாடற் குழுக்களை தேர்வு செய்க:"
diff --git a/tamil/po/organization.ta.po b/tamil/po/organization.ta.po
index ac7eb583eaa..3f757faf51e 100644
--- a/tamil/po/organization.ta.po
+++ b/tamil/po/organization.ta.po
@@ -80,24 +80,24 @@ msgid "Officers"
msgstr "அலுவலர்கள்"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "வழங்கல்"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "விளம்பரம்"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "ஆதரவும் கட்டமைப்பும்"
@@ -114,223 +114,221 @@ msgstr "அணித்தலைவர்"
msgid "Technical Committee"
msgstr "தொழில்நுட்பக் குழு"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "செயலர்"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "உருவாக்கத் திட்டங்கள்"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "கோபநெ பெட்டகம்"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "கோபநெ முதல்வர்"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "கோபநெ துணைவோர்"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "தனிப்பட்ட பொதிகள்"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "வெளியீடு நிர்வாகம்"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "வெளியீட்டுக் குறிப்புகள்"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "தர உத்தரவாதம்"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "நிறுவலுக்கான குழுமம்"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "வெளியீட்டுக் குறிப்புகள்"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "குறு வட்டு பிம்பங்கள்"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "உருவாக்கம்"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "சோதனை"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "ஆதரவும் கட்டமைப்பும்"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "சமை நிர்வாகம்"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "ஆவணமாக்கம்"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "பணித்-தேவைப் படுபவை மற்றும் வாய்ப்புள்ள பொதிகளின் பட்டியல்"
-#: ../../english/intro/organization.data:178
-#, fuzzy
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "நிறுவலுக்கான குழுமம்"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "துறைகள்"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "சிறப்பு வடிவமைப்புகள்"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "மடிக்கணினிகள்"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "அரண்கள்"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "உட்பொதிந்த சாதனங்கள்"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "பத்திரிக்கை தொடர்பு"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "இணையப் பக்கங்கள்"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "பெண்களுக்கான டெபியன் திட்டம்"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "சம்பவங்கள்"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "தொழில்நுட்பக் குழு"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "பங்குதாரர் திட்டம்"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "வன்பொருள் தான ஒருங்கிணைப்பு"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "பயனர் ஆதரவு"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "வழுக் கண்காணிப்பு அமைப்பு"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "மடலாடற் குழு நிர்வாகம் மற்றும் மடலாடற் குழு பெட்டகம்"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "புதிய பராமமரிப்பாளர்கள் முன்னணி"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "டெபியன் கணக்கு மேலாளர்கள்"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "துருப்பு பராமரிப்பாளர்கள் (பிஜிபி மற்றும் ஜிபிஜி)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "பாதுகாப்புக் குழு"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "ஆலோசகர் பக்கம்"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "வட்டு வழங்குவோர் பக்கம்"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "கொள்கை"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "அமைப்பு நிர்வாகம்"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -338,7 +336,7 @@ msgstr ""
"ஏதெனுமொரு டெபியன் இயந்திரத்தில், கடவுச்சொல் உள்ளிட்ட கோளாறு ஏற்படின் பயன்படுத்தப் பட "
"வேண்டிய முகவரி இது. இல்லையெனில் தாங்கள் நிறுவிட பொதியொன்றுத் தேவைப் படுகிறது. "
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -348,90 +346,112 @@ msgstr ""
"machines.cgi\">டெபியன் இயந்திரங்கள்</a> பக்கத்தினை அணுகவும், பிரதி இயந்திரத்துக்கான "
"நிர்வாகத் தகவலை அது கொண்டிருக்கலாம்."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP உருவாக்குநர் அடைவு நிர்வாகி"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "பிம்பங்கள்"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS பராமரிப்பாளர்"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "பொதி கண்காணிப்பு அமைப்பு"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "அலியோத் நிர்வாகிகள்"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "அலியோத் நிர்வாகிகள்"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "1 முதல் 99 வரைக் குழந்தைகளுக்கான டெபியன்"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "கல்விக்கான டெபியன்"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "சட்ட அலுவலகங்களில் டெபியன்"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "ஊனமுற்றோருக்கான டெபியன்"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
-#~ msgid "Publicity"
-#~ msgstr "விளம்பரம்"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "கல்விக்கான டெபியன்"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "தனிப்பட்ட டெபியன் வழங்கல்கள்"
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "பாதுகாப்புக் குழு"
-#~ msgid "Release Managers for ``stable''"
-#~ msgstr "\"நிலையானவை\" க்கான வெளியீட்டு மேலாளர்"
+#~ msgid "Security Audit Project"
+#~ msgstr "பாதுகாப்பு தணிக்கைத் திட்டம்"
-#~ msgid "Release Assistants"
-#~ msgstr "வெளியீட்டு உதவியாளர்கள்"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "இது முறையான டெபியன் திட்டமல்ல. ஆனால் அது ஒருங்கிணைக்கப் படுவதற்கான நோக்கம் "
+#~ "அறிவிக்கப்பட்டுள்ளதுதப் பட்டுள்ளது."
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "``நிலையானவைக்கான'' வெளியீட்டு உதவியாளர்கள்"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "டெபியன் பல்லூடக வழங்கல்"
-#~ msgid "Release Wizard"
-#~ msgstr "வெளியீட்டு பலகை"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "இலாப நோக்கற்ற நிறுவனங்களுக்கான டெபியன்"
-#~ msgid "Vendors"
-#~ msgstr "வழங்குவோர்"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "அகிலத்துக்குமான இயங்கு தளம்"
-#~ msgid "APT Team"
-#~ msgstr "ஏபிடி குழு"
+#~ msgid "Accountant"
+#~ msgstr "கணக்காளர்"
-#~ msgid "Handhelds"
-#~ msgstr "கையடக்க"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "துருப்பு ஒப்புமை ஒருங்கிணைப்பு"
-#~ msgid "Security Testing Team"
-#~ msgstr "பாதுகாப்புச் சோதனைக் குழு"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "தனிப்பட்ட சமைப்புக்கான நிர்வாகியின் பெயரை <a href=\"http://www.buildd.net"
+#~ "\">http://www.buildd.net</a> முகவரியில் காணலாம். கட்டமைப்பு ஒன்றையும் "
+#~ "வழங்கலொன்றையும் தேர்வு செய்து கிடைக்கக் கூடிய சமைப்புகளையும் அவற்றின் நிர்வாகிகளையும் "
+#~ "காணலாம்."
#~ msgid ""
#~ "The admins responsible for buildd's for a particular arch can be reached "
@@ -442,42 +462,37 @@ msgstr "மருத்துவப் பழகலுக்கும் ஆர
#~ "arch@buildd.debian.org> முகவரியில் தொடர்புக் கொள்ளலாம். உதாரணம் <genericemail "
#~ "i386@buildd.debian.org>."
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "தனிப்பட்ட சமைப்புக்கான நிர்வாகியின் பெயரை <a href=\"http://www.buildd.net"
-#~ "\">http://www.buildd.net</a> முகவரியில் காணலாம். கட்டமைப்பு ஒன்றையும் "
-#~ "வழங்கலொன்றையும் தேர்வு செய்து கிடைக்கக் கூடிய சமைப்புகளையும் அவற்றின் நிர்வாகிகளையும் "
-#~ "காணலாம்."
+#~ msgid "Security Testing Team"
+#~ msgstr "பாதுகாப்புச் சோதனைக் குழு"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "துருப்பு ஒப்புமை ஒருங்கிணைப்பு"
+#~ msgid "Handhelds"
+#~ msgstr "கையடக்க"
-#~ msgid "Accountant"
-#~ msgstr "கணக்காளர்"
+#~ msgid "APT Team"
+#~ msgstr "ஏபிடி குழு"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "அகிலத்துக்குமான இயங்கு தளம்"
+#~ msgid "Vendors"
+#~ msgstr "வழங்குவோர்"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "இலாப நோக்கற்ற நிறுவனங்களுக்கான டெபியன்"
+#~ msgid "Release Wizard"
+#~ msgstr "வெளியீட்டு பலகை"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "டெபியன் பல்லூடக வழங்கல்"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "``நிலையானவைக்கான'' வெளியீட்டு உதவியாளர்கள்"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "இது முறையான டெபியன் திட்டமல்ல. ஆனால் அது ஒருங்கிணைக்கப் படுவதற்கான நோக்கம் "
-#~ "அறிவிக்கப்பட்டுள்ளதுதப் பட்டுள்ளது."
+#~ msgid "Release Assistants"
+#~ msgstr "வெளியீட்டு உதவியாளர்கள்"
-#~ msgid "Security Audit Project"
-#~ msgstr "பாதுகாப்பு தணிக்கைத் திட்டம்"
+#~ msgid "Release Managers for ``stable''"
+#~ msgstr "\"நிலையானவை\" க்கான வெளியீட்டு மேலாளர்"
+
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "தனிப்பட்ட டெபியன் வழங்கல்கள்"
+
+#~ msgid "Publicity"
+#~ msgstr "விளம்பரம்"
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "பாதுகாப்புக் குழு"
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "நிறுவலுக்கான குழுமம்"
diff --git a/tamil/po/others.ta.po b/tamil/po/others.ta.po
index 6073c79935a..802bf0fa14f 100755..100644
--- a/tamil/po/others.ta.po
+++ b/tamil/po/others.ta.po
@@ -339,144 +339,144 @@ msgstr "வெளியீடு"
msgid "URL"
msgstr "URL"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "தேவை:"
-#~ msgid "Previous Talks:"
-#~ msgstr "முந்தையப் பேச்சுகள்:"
+#~ msgid "Who:"
+#~ msgstr "யார்:"
-#~ msgid "Languages:"
-#~ msgstr "மொழிகள்:"
+#~ msgid "Architecture:"
+#~ msgstr "கட்டமைப்பு:"
-#~ msgid "Location:"
-#~ msgstr "இடம்:"
+#~ msgid "Specifications:"
+#~ msgstr "தேவைக்குறிப்புகள்:"
-#~ msgid "Topics:"
-#~ msgstr "தலைப்புகள்:"
+#~ msgid "Where:"
+#~ msgstr "எங்கே:"
-#~ msgid "closed"
-#~ msgstr "மூடுகக்க"
+#~ msgid "Name:"
+#~ msgstr "பெயர்:"
-#~ msgid "open"
-#~ msgstr "திறக்க"
+#~ msgid "Company:"
+#~ msgstr "நிறுவனம்:"
-#~ msgid "Unsubscribe"
-#~ msgstr "விலகுக"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "தாங்கள் விலக விரும்மும் மடலாடற் குழுக்களைத் தேர்வு செய்க:"
+#~ msgid "or"
+#~ msgstr "அல்லது"
+
+#~ msgid "Email:"
+#~ msgstr "மின்னஞ்சல்:"
+
+#~ msgid "Rates:"
+#~ msgstr "விலை:"
+
+#~ msgid "Willing to Relocate"
+#~ msgstr "இருப்பிடத்தை மாற்றிக் கொள்ள விருப்பம்"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "மின்னஞ்சல் துணைக் கொண்டு விலகுவது எப்படி எனபது குறித்து அறிய <a href=\"./"
-#~ "#subunsub\">மடலாடற் குழுக்களின்</a> பக்கத்தினைப் பார்க்கவும். சேரும் பொருட்டு<a href="
-#~ "\"subscribe\">சேர்வதற்கான இணைய படிவம்</a> ஒன்றும் கிடைக்கிறது."
+#~ "அகிலமனைத்திலும் உள்ள <total_consultant> டெபியன் ஆலோசகர்கள் பட்டியல் "
+#~ "<total_country>."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "மடலாடற் குழுவிலிருந்து விலக"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "மடலாடற் குழுவில் இணைய"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
-#~ "<a href=\"./#ads\">டெபியன் மடலாடற் குழு விளம்பரக் கொள்கையை</a> மதித்தொழுகவும்."
+#~ "மின்னஞ்சல் தந்து இணைவது குறித்து அறிய <a href=\"./#subunsub\">மடலாடற் குழு</a> "
+#~ "பக்கத்தைப் பார்க்க. <a href=\"unsubscribe\">விலகுவதற்கான இணைய படிவமும்</a> "
+#~ "உள்ளது. "
-#~ msgid "Clear"
-#~ msgstr "துடைக்க"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "டெபியனின் மடலாடற் குழுக்கள் பொது மேடையாகும். அவற்றுக்கு அனுப்பப்படும் எந்தவொரு மடலும் "
+#~ "பொது பெட்டகங்களில் பதிப்பிக்கப்பட்டு தேடு பொறிகளால் வரிசைப் படுத்தப்படும். டெபியன் "
+#~ "மடலாடற் குழுக்களில் பொதுப் பார்வையில் இடத்தக்கதாக தாங்கள் கருதும் மடல் முகவரியினைக் "
+#~ "கொண்டு சேரவும்."
-#~ msgid "Subscribe"
-#~ msgstr "சேருக"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "தாங்கள் சேர விழையும் மடலாடற் குழுக்களை தேர்வு செய்க:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "தங்களின் மின்னஞ்சல்:"
+#~ msgid "No description given"
+#~ msgstr "விவரமளிக்கப் படவில்லை"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "வாசிக்க மட்டும், தொகுக்கப்பட்ட வெளியீடு."
+#~ msgid "Moderated:"
+#~ msgstr "நெறிபடுத்தப்பட்ட:"
-#~ msgid "Subscription:"
-#~ msgstr "சேருக:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "இணைந்தோர் மாத்திரமே மடலனுப்ப இயலும்"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
#~ msgstr "டெபியன் உருவாக்குநரால் ஒப்பமிடப் பட்ட மடல்களை மாத்திரமே இக்குழுமம் ஏற்கும்."
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "இணைந்தோர் மாத்திரமே மடலனுப்ப இயலும்"
+#~ msgid "Subscription:"
+#~ msgstr "சேருக:"
-#~ msgid "Moderated:"
-#~ msgstr "நெறிபடுத்தப்பட்ட:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "வாசிக்க மட்டும், தொகுக்கப்பட்ட வெளியீடு."
-#~ msgid "No description given"
-#~ msgstr "விவரமளிக்கப் படவில்லை"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "தங்களின் மின்னஞ்சல்:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "தாங்கள் சேர விழையும் மடலாடற் குழுக்களை தேர்வு செய்க:"
+#~ msgid "Subscribe"
+#~ msgstr "சேருக"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "டெபியனின் மடலாடற் குழுக்கள் பொது மேடையாகும். அவற்றுக்கு அனுப்பப்படும் எந்தவொரு மடலும் "
-#~ "பொது பெட்டகங்களில் பதிப்பிக்கப்பட்டு தேடு பொறிகளால் வரிசைப் படுத்தப்படும். டெபியன் "
-#~ "மடலாடற் குழுக்களில் பொதுப் பார்வையில் இடத்தக்கதாக தாங்கள் கருதும் மடல் முகவரியினைக் "
-#~ "கொண்டு சேரவும்."
+#~ msgid "Clear"
+#~ msgstr "துடைக்க"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "மின்னஞ்சல் தந்து இணைவது குறித்து அறிய <a href=\"./#subunsub\">மடலாடற் குழு</a> "
-#~ "பக்கத்தைப் பார்க்க. <a href=\"unsubscribe\">விலகுவதற்கான இணைய படிவமும்</a> "
-#~ "உள்ளது. "
+#~ "<a href=\"./#ads\">டெபியன் மடலாடற் குழு விளம்பரக் கொள்கையை</a> மதித்தொழுகவும்."
-#~ msgid "Mailing List Subscription"
-#~ msgstr "மடலாடற் குழுவில் இணைய"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "மடலாடற் குழுவிலிருந்து விலக"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
-#~ "அகிலமனைத்திலும் உள்ள <total_consultant> டெபியன் ஆலோசகர்கள் பட்டியல் "
-#~ "<total_country>."
-
-#~ msgid "Willing to Relocate"
-#~ msgstr "இருப்பிடத்தை மாற்றிக் கொள்ள விருப்பம்"
-
-#~ msgid "Rates:"
-#~ msgstr "விலை:"
-
-#~ msgid "Email:"
-#~ msgstr "மின்னஞ்சல்:"
+#~ "மின்னஞ்சல் துணைக் கொண்டு விலகுவது எப்படி எனபது குறித்து அறிய <a href=\"./"
+#~ "#subunsub\">மடலாடற் குழுக்களின்</a> பக்கத்தினைப் பார்க்கவும். சேரும் பொருட்டு<a href="
+#~ "\"subscribe\">சேர்வதற்கான இணைய படிவம்</a> ஒன்றும் கிடைக்கிறது."
-#~ msgid "or"
-#~ msgstr "அல்லது"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "தாங்கள் விலக விரும்மும் மடலாடற் குழுக்களைத் தேர்வு செய்க:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Unsubscribe"
+#~ msgstr "விலகுக"
-#~ msgid "Company:"
-#~ msgstr "நிறுவனம்:"
+#~ msgid "open"
+#~ msgstr "திறக்க"
-#~ msgid "Name:"
-#~ msgstr "பெயர்:"
+#~ msgid "closed"
+#~ msgstr "மூடுகக்க"
-#~ msgid "Where:"
-#~ msgstr "எங்கே:"
+#~ msgid "Topics:"
+#~ msgstr "தலைப்புகள்:"
-#~ msgid "Specifications:"
-#~ msgstr "தேவைக்குறிப்புகள்:"
+#~ msgid "Location:"
+#~ msgstr "இடம்:"
-#~ msgid "Architecture:"
-#~ msgstr "கட்டமைப்பு:"
+#~ msgid "Languages:"
+#~ msgstr "மொழிகள்:"
-#~ msgid "Who:"
-#~ msgstr "யார்:"
+#~ msgid "Previous Talks:"
+#~ msgstr "முந்தையப் பேச்சுகள்:"
-#~ msgid "Wanted:"
-#~ 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 4bf44c6617a..6d1e8018a15 100644
--- a/tamil/po/partners.ta.po
+++ b/tamil/po/partners.ta.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/tamil/po/ports.ta.po b/tamil/po/ports.ta.po
index a7ad7aa3958..db16fba6901 100755..100644
--- a/tamil/po/ports.ta.po
+++ b/tamil/po/ports.ta.po
@@ -117,32 +117,32 @@ msgstr "பவர் கணினிக்கான டெபியன்"
msgid "Debian for Sparc"
msgstr "ஸ்பார்க்குக்கான டெபியன்"
-#~ msgid "Debian for AMD64"
-#~ msgstr "ஏஎம்டி64 க்கான டெபியன்"
-
-#~ msgid "Debian for ARM"
-#~ msgstr "ஏஆர்எம் க்கான டெபியன்"
+#~ msgid "Debian for Laptops"
+#~ msgstr "மடிக்கணினிகளுக்கான டெபியன்"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "பியோவுல்ப் க்கான டெபியன்"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "ஸ்பார்க்64 க்கான டெபியன்"
-#~ msgid "Main"
-#~ msgstr "பிரதான"
+#~ msgid "Debian for S/390"
+#~ msgstr "எஸ்/390 க்கான டெபியன்"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "குனு/ப்ஃரீபிஎஸ்டி க்கான டெபியன்"
+#~ msgid "Debian for MIPS"
+#~ msgstr "எம்ஐபிஎஸ் க்கான டெபியன்"
#~ msgid "Debian for Motorola 680x0"
#~ msgstr "மோடரோலா 680x0 க்கான"
-#~ msgid "Debian for MIPS"
-#~ msgstr "எம்ஐபிஎஸ் க்கான டெபியன்"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "குனு/ப்ஃரீபிஎஸ்டி க்கான டெபியன்"
-#~ msgid "Debian for S/390"
-#~ msgstr "எஸ்/390 க்கான டெபியன்"
+#~ msgid "Main"
+#~ msgstr "பிரதான"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "ஸ்பார்க்64 க்கான டெபியன்"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "பியோவுல்ப் க்கான டெபியன்"
-#~ msgid "Debian for Laptops"
-#~ msgstr "மடிக்கணினிகளுக்கான டெபியன்"
+#~ msgid "Debian for ARM"
+#~ msgstr "ஏஆர்எம் க்கான டெபியன்"
+
+#~ msgid "Debian for AMD64"
+#~ msgstr "ஏஎம்டி64 க்கான டெபியன்"
diff --git a/tamil/po/stats.ta.po b/tamil/po/stats.ta.po
index b2248017107..0d934917f17 100644
--- a/tamil/po/stats.ta.po
+++ b/tamil/po/stats.ta.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/tamil/po/templates.ta.po b/tamil/po/templates.ta.po
index a0779d5fad3..9ec2441f3aa 100644
--- a/tamil/po/templates.ta.po
+++ b/tamil/po/templates.ta.po
@@ -217,11 +217,11 @@ msgstr "2.2 வெளியீட்டில்"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"இணையத் தளத்திலுள்ள பிரச்சனைக் குறித்து தெரிவிக்க, <a href=\"mailto:debian-www@lists."
"debian.org\">debian-www@lists.debian.org</a> க்கு மடலிடவும். தொடர்பு கொள்ள "
@@ -529,6 +529,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>குறிப்பு:</em> இம்மொழி பெயர்ப்பின் முதல் ஆவணம் இனியும் இல்லை."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -537,562 +541,562 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "<a href=\"../\">டெபியனைப் பயன்படுத்துவோர் யார்?</a> பக்கத்திற்கு திரும்புக."
-#~ msgid "More information"
-#~ msgstr "மேறகொண்டு விவரமறிய"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "எதிர்வருபவை"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "இணைப்பு இனி செல்லுபடியாகாதிருக்கலாம்"
-
-#~ msgid "When"
-#~ msgstr "எப்பொழுது"
-
-#~ msgid "Where"
-#~ msgstr "எங்கே"
-
-#~ msgid "More Info"
-#~ msgstr "மேலும் விவரங்களுக்கு"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "தள ஆதரவாளரை அறிய"
-#~ msgid "Debian Involvement"
-#~ msgstr "டெபியன் ஈடுபாடு"
+#~ msgid "Select a server near you"
+#~ msgstr "தங்களுக்கு அருகாமையிலுள்ள வழங்கியினைத் தேர்வுச் செய்க"
-#~ msgid "Main Coordinator"
-#~ msgstr "முதன்மை ஒருங்கிணைப்பாளர்"
+#~ msgid "More information:"
+#~ msgstr "மேலும் விவரங்களுக்கு:"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>திட்ட</th><th>ஒருங்கிணைப்பாளர்</th>"
+#~ msgid "Taken by:"
+#~ msgstr "ஏற்றவர்:"
-#~ msgid "Related Links"
-#~ msgstr "தொடர்புடைய இணைப்புகள்"
+#~ msgid "Nobody"
+#~ msgstr "யாருமில்லை"
-#~ msgid "Latest News"
-#~ msgstr "புதிய செய்தி"
+#~ msgid "Rating:"
+#~ msgstr "தரமதிப்பீடு:"
-#~ msgid "Download calendar entry"
-#~ msgstr "நாட்காட்டிப் பதிவை பதிவிறக்குக"
+#~ msgid "List of Consultants"
+#~ msgstr "ஆலோசகர்கள் பட்டியல்"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "ஏனைய <a href=\"./\">டெபியன் செயதிகளுக்குத் </a> திரும்பவும் || <a href="
-#~ "\"m4_HOME/\">டெபியன் திட்ட முதற் பக்கம்</a>."
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "<a href=\"./\">டெபியன் ஆலோசகர்கள் பக்கத்திற்குத்</a> திரும்புக."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (செயற் படாத இணைப்பு)"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian."
-#~ "org/debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
-
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "செய்தியறிக்கையின்<a href=\"../../\">முந்தைய பதிப்புகள்</a> கிடைக்கின்றன."
+#~| msgid "Network install"
+#~ msgid "Network Install"
+#~ msgstr "பிணைய நிறுவல்"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"misc-bottom\" />misc"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />%s இதனை மொழிபெயர்த்தார்."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />பிம்ப வெளியீட்டுத் தகவல்"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />%s இதனை மொழிபெயர்த்தார்."
+#~ msgid "Debian CD team"
+#~ msgstr "டெபியன் வட்டுக் குழு"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
+#~ msgid "debian_on_cd"
+#~ msgstr "வட்டில்_டெபியன்"
-#~ msgid "List of Speakers"
-#~ msgstr "பேச்சாளர் பட்டியல்"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />கேள்விகள்"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "<a href=\"./\">டெபியன்</a> பேச்சாளர் பக்கத்திற்குத் திரும்புக."
+#~ msgid "jigdo"
+#~ msgstr "ஜிக்டோ"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian."
-#~ "org/debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
+#~ msgid "http_ftp"
+#~ msgstr "மீபநெ_கோபநெ"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "buy"
+#~ msgstr "வாங்குக"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "net_install"
+#~ msgstr "பிணைய_நிறுவல்"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "வட்டுக்களுக்கான ஆங்கில மொழியில்<a href=\"/MailingLists/disclaimer\">பொது "
+#~ "மடலாடற் குழு</a> :"
-#~ msgid "No requests for adoption"
-#~ msgstr "தத்தெடுப்பதற்கான கோரிக்கைகள் எதுவும் இல்லை"
+#~ msgid "Date"
+#~ msgstr "தேதி"
-#~ msgid "No orphaned packages"
-#~ msgstr "கைவிடப்பட்ட பொதிகள் எதுவும் இல்லை"
+#~ msgid "Time Line"
+#~ msgstr "காலவரை"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "தத்தெடுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
+#~ msgid "Nominations"
+#~ msgstr "பரிந்துரைகள்"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "பொதியாக்கும்டுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
+#~ msgid "Debate"
+#~ msgstr "விவாதம்"
-#~ msgid "No Requested packages"
-#~ msgstr "எந்த பொதியும் கோரப்படவில்லை"
+#~ msgid "Platforms"
+#~ msgstr "கட்டமைப்புகள்"
-#~ msgid "No help requested"
-#~ msgstr "எந்த உதவியும் கோரப்படவில்லை"
+#~ msgid "Proposer"
+#~ msgstr "பரிந்துரைத்தவர்"
-#~ msgid "in adoption since today."
-#~ msgstr "இன்றிற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "பரிந்துரை அ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "நேற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "பரிந்துரை இ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s நாட்களாக தத்தெடுக்கப் பட்டுள்ளது."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "பரிந்துரை உ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "in preparation since today."
-#~ msgstr "இன்றிலிருந்து தயாரிக்கப் பட்டு வருகின்றது."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "பரிந்துரை எ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "நேற்றிலிருந்து தயாரிக்கப் பட்டு வருகிறது."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "பரிந்துரை ஐ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "%s days in preparation."
-#~ msgstr "தயாரிப்பில் %s நாட்கள்."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "பரிந்துரை ஒ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "requested today."
-#~ msgstr "இன்று கோரப்பட்டது."
+#~ msgid "Seconds"
+#~ msgstr "நொடிகள்"
-#~ msgid "requested yesterday."
-#~ msgstr "நேற்று கோரப்பட்டது"
+#~ msgid "Proposal A Seconds"
+#~ msgstr "பரிந்துரை அ நொடிகள்"
-#~ msgid "requested %s days ago."
-#~ msgstr "%s நாட்களுக்கு முன் கோரப்பட்டது."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "பரிந்துரை இ நொடிகள்"
-#~ msgid "package info"
-#~ msgstr "பொதி விவரம்"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "பரிந்துரை உ நொடிகள்"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />பிம்பக் கருவியின் மாதிரி"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "பரிந்துரை எ நொடிகள்"
-#~ msgid "License Information"
-#~ msgstr "உரிம விவரம்"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "பரிந்துரை ஐ நொடிகள்"
-#~ msgid "DLS Index"
-#~ msgstr "டிஎல்எஸ் வரிசை"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "பரிந்துரை ஒ நொடிகள்"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Opposition"
+#~ msgstr "எதிர்தரப்பு"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG கேள்விகள்"
+#~ msgid "Text"
+#~ msgstr "உரை"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "டெபியன்-சட்ட பெட்டகம்"
+#~ msgid "Proposal A"
+#~ msgstr "பரிந்துரை அ"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Proposal B"
+#~ msgstr "பரிந்துரை இ"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, வெளியீடு %s: %s"
+#~ msgid "Proposal C"
+#~ msgstr "பரிந்துரை உ"
-#~ msgid "Date published"
-#~ msgstr "பதிப்பிக்கப் பட்ட தேதி"
+#~ msgid "Proposal D"
+#~ msgstr "பரிந்துரை எ"
-#~ msgid "License"
-#~ msgstr "உரிமம்"
+#~ msgid "Proposal E"
+#~ msgstr "பரிந்துரை ஐ"
-#~ msgid "Version"
-#~ msgstr "வெளியீடு"
+#~ msgid "Proposal F"
+#~ msgstr "பரிந்துரை ஒ"
-#~ msgid "Summary"
-#~ msgstr "தொகுப்புரை"
+#~ msgid "Choices"
+#~ msgstr "தேர்வுகள்"
-#~ msgid "Justification"
-#~ msgstr "நியாயம்"
+#~ msgid "Amendment Proposer"
+#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர்"
-#~ msgid "Discussion"
-#~ msgstr "விவாதம்"
+#~ msgid "Amendment Seconds"
+#~ msgstr "திருத்த நொடிகள்"
-#~ msgid "Original Summary"
-#~ msgstr "முதல் தொகுப்புரைை"
+#~ msgid "Amendment Text"
+#~ msgstr "திருத்த உரைகள்"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "முதல் உரைத் தொகுப்பினை <summary-author/> <a href=\"<summary-url/>"
-#~ "\">பெட்டகத்தில்</a> காணலாம்."
+#~ msgid "Amendment Proposer A"
+#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் அ"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "உரைத் தொகுப்பினைத் தயாரித்தவர் <summary-author/>."
+#~ msgid "Amendment Seconds A"
+#~ msgstr "திருத்த நொடிகள் அ"
-#~ msgid "License text (translated)"
-#~ msgstr "உரிம உரை (மொழிபெயர்க்கப் பட்டது)"
+#~ msgid "Amendment Text A"
+#~ msgstr "திருத்த உரை அ"
-#~ msgid "License text"
-#~ msgstr "உரிம உரை"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் இ"
-#~ msgid "free"
-#~ msgstr "கட்டற்ற"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "திருத்த நொடிகள் இ"
-#~ msgid "non-free"
-#~ msgstr "கட்டுடைய"
+#~ msgid "Amendment Text B"
+#~ msgstr "திருத்த நொடிகள் இ"
-#~ msgid "not redistributable"
-#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
+#~ msgid "Amendments"
+#~ msgstr "திருத்தங்கள்"
-#~ msgid "Free"
-#~ msgstr "கட்டற்ற"
+#~ msgid "Proceedings"
+#~ msgstr "நிகழ்பவை"
-#~ msgid "Non-Free"
-#~ msgstr "கட்டுடைய"
+#~ msgid "Majority Requirement"
+#~ msgstr "பெரும்பான்மைத் தேவை"
-#~ msgid "Not Redistributable"
-#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
+#~ msgid "Data and Statistics"
+#~ msgstr "தரவும் புள்ளி விவரமும்"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "டெபியன் உரிமங்கள் குறித்து அறிய <a href=\"./\">உரிமத் தகவல்</a> பக்கத்தின் "
-#~ "துணையினை நாடுக."
+#~ msgid "Quorum"
+#~ msgstr "குறைந்தபட்ச தேவை"
-#~ msgid "Vote"
-#~ msgstr "வாக்களி"
+#~ msgid "Minimum Discussion"
+#~ msgstr "குறைந்த பட்ச கலந்தாயவு"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "விளைவொன்றை&nbsp;வாசிக்கவும்&nbsp;"
+#~ msgid "Ballot"
+#~ msgstr "வாக்கெடுப்பு"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "பரிந்துரையொன்றை&nbsp;பின்பற்றவும்&nbsp;"
+#~ msgid "Forum"
+#~ msgstr "தருக்கம்"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "பரிந்துரையொன்றை&nbsp;அமல் படுத்துக&nbsp;"
+#~ msgid "Outcome"
+#~ msgstr "விளைவு"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "பரிந்துரையொன்றை&nbsp;சமர்பிக்கவும்&nbsp;"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "ஆதரவாளர்களுக்காக&nbsp;காத்திருக்கிறொம்&nbsp;"
-#~ msgid "How&nbsp;To"
-#~ msgstr "எப்படி"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "விவாதத்தில்"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "&nbsp;வாக்களிப்பின்&nbsp;முதற் பக்கத்திற்கு"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "வாக்கெடுப்பு&nbsp;நடைபெறுகிறது "
-#~ msgid "Other"
-#~ msgstr "ஏனைய"
+#~ msgid "Decided"
+#~ msgstr "தீர்மானிக்கப்பட்டது"
#~ msgid "Withdrawn"
#~ msgstr "திரும்பப் பெறப் பட்டது"
-#~ msgid "Decided"
-#~ msgstr "தீர்மானிக்கப்பட்டது"
+#~ msgid "Other"
+#~ msgstr "ஏனைய"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "வாக்கெடுப்பு&nbsp;நடைபெறுகிறது "
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "&nbsp;வாக்களிப்பின்&nbsp;முதற் பக்கத்திற்கு"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "விவாதத்தில்"
+#~ msgid "How&nbsp;To"
+#~ msgstr "எப்படி"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "ஆதரவாளர்களுக்காக&nbsp;காத்திருக்கிறொம்&nbsp;"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "பரிந்துரையொன்றை&nbsp;சமர்பிக்கவும்&nbsp;"
-#~ msgid "Outcome"
-#~ msgstr "விளைவு"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "பரிந்துரையொன்றை&nbsp;அமல் படுத்துக&nbsp;"
-#~ msgid "Forum"
-#~ msgstr "தருக்கம்"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "பரிந்துரையொன்றை&nbsp;பின்பற்றவும்&nbsp;"
-#~ msgid "Ballot"
-#~ msgstr "வாக்கெடுப்பு"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "விளைவொன்றை&nbsp;வாசிக்கவும்&nbsp;"
-#~ msgid "Minimum Discussion"
-#~ msgstr "குறைந்த பட்ச கலந்தாயவு"
+#~ msgid "Vote"
+#~ msgstr "வாக்களி"
-#~ msgid "Quorum"
-#~ msgstr "குறைந்தபட்ச தேவை"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "டெபியன் உரிமங்கள் குறித்து அறிய <a href=\"./\">உரிமத் தகவல்</a> பக்கத்தின் "
+#~ "துணையினை நாடுக."
-#~ msgid "Data and Statistics"
-#~ msgstr "தரவும் புள்ளி விவரமும்"
+#~ msgid "Not Redistributable"
+#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
-#~ msgid "Majority Requirement"
-#~ msgstr "பெரும்பான்மைத் தேவை"
+#~ msgid "Non-Free"
+#~ msgstr "கட்டுடைய"
-#~ msgid "Proceedings"
-#~ msgstr "நிகழ்பவை"
+#~ msgid "Free"
+#~ msgstr "கட்டற்ற"
-#~ msgid "Amendments"
-#~ msgstr "திருத்தங்கள்"
+#~ msgid "not redistributable"
+#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
-#~ msgid "Amendment Text B"
-#~ msgstr "திருத்த நொடிகள் இ"
+#~ msgid "non-free"
+#~ msgstr "கட்டுடைய"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "திருத்த நொடிகள் இ"
+#~ msgid "free"
+#~ msgstr "கட்டற்ற"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் இ"
+#~ msgid "License text"
+#~ msgstr "உரிம உரை"
-#~ msgid "Amendment Text A"
-#~ msgstr "திருத்த உரை அ"
+#~ msgid "License text (translated)"
+#~ msgstr "உரிம உரை (மொழிபெயர்க்கப் பட்டது)"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "திருத்த நொடிகள் அ"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "உரைத் தொகுப்பினைத் தயாரித்தவர் <summary-author/>."
-#~ msgid "Amendment Proposer A"
-#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் அ"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "முதல் உரைத் தொகுப்பினை <summary-author/> <a href=\"<summary-url/>"
+#~ "\">பெட்டகத்தில்</a> காணலாம்."
-#~ msgid "Amendment Text"
-#~ msgstr "திருத்த உரைகள்"
+#~ msgid "Original Summary"
+#~ msgstr "முதல் தொகுப்புரைை"
-#~ msgid "Amendment Seconds"
-#~ msgstr "திருத்த நொடிகள்"
+#~ msgid "Discussion"
+#~ msgstr "விவாதம்"
-#~ msgid "Amendment Proposer"
-#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர்"
+#~ msgid "Justification"
+#~ msgstr "நியாயம்"
-#~ msgid "Choices"
-#~ msgstr "தேர்வுகள்"
+#~ msgid "Summary"
+#~ msgstr "தொகுப்புரை"
-#~ msgid "Proposal F"
-#~ msgstr "பரிந்துரை ஒ"
+#~ msgid "Version"
+#~ msgstr "வெளியீடு"
-#~ msgid "Proposal E"
-#~ msgstr "பரிந்துரை ஐ"
+#~ msgid "License"
+#~ msgstr "உரிமம்"
-#~ msgid "Proposal D"
-#~ msgstr "பரிந்துரை எ"
+#~ msgid "Date published"
+#~ msgstr "பதிப்பிக்கப் பட்ட தேதி"
-#~ msgid "Proposal C"
-#~ msgstr "பரிந்துரை உ"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, வெளியீடு %s: %s"
-#~ msgid "Proposal B"
-#~ msgstr "பரிந்துரை இ"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Proposal A"
-#~ msgstr "பரிந்துரை அ"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "டெபியன்-சட்ட பெட்டகம்"
-#~ msgid "Text"
-#~ msgstr "உரை"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG கேள்விகள்"
-#~ msgid "Opposition"
-#~ msgstr "எதிர்தரப்பு"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "பரிந்துரை ஒ நொடிகள்"
+#~ msgid "DLS Index"
+#~ msgstr "டிஎல்எஸ் வரிசை"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "பரிந்துரை ஐ நொடிகள்"
+#~ msgid "License Information"
+#~ msgstr "உரிம விவரம்"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "பரிந்துரை எ நொடிகள்"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />பிம்பக் கருவியின் மாதிரி"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "பரிந்துரை உ நொடிகள்"
+#~ msgid "package info"
+#~ msgstr "பொதி விவரம்"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "பரிந்துரை இ நொடிகள்"
+#~ msgid "requested %s days ago."
+#~ msgstr "%s நாட்களுக்கு முன் கோரப்பட்டது."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "பரிந்துரை அ நொடிகள்"
+#~ msgid "requested yesterday."
+#~ msgstr "நேற்று கோரப்பட்டது"
-#~ msgid "Seconds"
-#~ msgstr "நொடிகள்"
+#~ msgid "requested today."
+#~ msgstr "இன்று கோரப்பட்டது."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "பரிந்துரை ஒ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "%s days in preparation."
+#~ msgstr "தயாரிப்பில் %s நாட்கள்."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "பரிந்துரை ஐ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "நேற்றிலிருந்து தயாரிக்கப் பட்டு வருகிறது."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "பரிந்துரை எ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in preparation since today."
+#~ msgstr "இன்றிலிருந்து தயாரிக்கப் பட்டு வருகின்றது."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "பரிந்துரை உ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s நாட்களாக தத்தெடுக்கப் பட்டுள்ளது."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "பரிந்துரை இ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "நேற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "பரிந்துரை அ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in adoption since today."
+#~ msgstr "இன்றிற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
-#~ msgid "Proposer"
-#~ msgstr "பரிந்துரைத்தவர்"
+#~ msgid "No help requested"
+#~ msgstr "எந்த உதவியும் கோரப்படவில்லை"
-#~ msgid "Platforms"
-#~ msgstr "கட்டமைப்புகள்"
+#~ msgid "No Requested packages"
+#~ msgstr "எந்த பொதியும் கோரப்படவில்லை"
-#~ msgid "Debate"
-#~ msgstr "விவாதம்"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "பொதியாக்கும்டுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
-#~ msgid "Nominations"
-#~ msgstr "பரிந்துரைகள்"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "தத்தெடுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
-#~ msgid "Time Line"
-#~ msgstr "காலவரை"
+#~ msgid "No orphaned packages"
+#~ msgstr "கைவிடப்பட்ட பொதிகள் எதுவும் இல்லை"
-#~ msgid "Date"
-#~ msgstr "தேதி"
+#~ msgid "No requests for adoption"
+#~ msgstr "தத்தெடுப்பதற்கான கோரிக்கைகள் எதுவும் இல்லை"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "வட்டுக்களுக்கான ஆங்கில மொழியில்<a href=\"/MailingLists/disclaimer\">பொது "
-#~ "மடலாடற் குழு</a> :"
+#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "net_install"
-#~ msgstr "பிணைய_நிறுவல்"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "buy"
-#~ msgstr "வாங்குக"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "http_ftp"
-#~ msgstr "மீபநெ_கோபநெ"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian."
+#~ "org/debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
-#~ msgid "jigdo"
-#~ msgstr "ஜிக்டோ"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">டெபியன்</a> பேச்சாளர் பக்கத்திற்குத் திரும்புக."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />கேள்விகள்"
+#~ msgid "List of Speakers"
+#~ msgstr "பேச்சாளர் பட்டியல்"
-#~ msgid "debian_on_cd"
-#~ msgstr "வட்டில்_டெபியன்"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
-#~ msgid "Debian CD team"
-#~ msgstr "டெபியன் வட்டுக் குழு"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />%s இதனை மொழிபெயர்த்தார்."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />பிம்ப வெளியீட்டுத் தகவல்"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />%s இதனை மொழிபெயர்த்தார்."
#, fuzzy
-#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid "<void id=\"misc-bottom\" />misc"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "செய்தியறிக்கையின்<a href=\"../../\">முந்தைய பதிப்புகள்</a> கிடைக்கின்றன."
#, fuzzy
-#~| msgid "Network install"
-#~ msgid "Network Install"
-#~ msgstr "பிணைய நிறுவல்"
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian."
+#~ "org/debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (செயற் படாத இணைப்பு)"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "<a href=\"./\">டெபியன் ஆலோசகர்கள் பக்கத்திற்குத்</a> திரும்புக."
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "ஏனைய <a href=\"./\">டெபியன் செயதிகளுக்குத் </a> திரும்பவும் || <a href="
+#~ "\"m4_HOME/\">டெபியன் திட்ட முதற் பக்கம்</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "ஆலோசகர்கள் பட்டியல்"
+#~ msgid "Download calendar entry"
+#~ msgstr "நாட்காட்டிப் பதிவை பதிவிறக்குக"
-#~ msgid "Rating:"
-#~ msgstr "தரமதிப்பீடு:"
+#~ msgid "Latest News"
+#~ msgstr "புதிய செய்தி"
-#~ msgid "Nobody"
-#~ msgstr "யாருமில்லை"
+#~ msgid "Related Links"
+#~ msgstr "தொடர்புடைய இணைப்புகள்"
-#~ msgid "Taken by:"
-#~ msgstr "ஏற்றவர்:"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>திட்ட</th><th>ஒருங்கிணைப்பாளர்</th>"
-#~ msgid "More information:"
-#~ msgstr "மேலும் விவரங்களுக்கு:"
+#~ msgid "Main Coordinator"
+#~ msgstr "முதன்மை ஒருங்கிணைப்பாளர்"
-#~ msgid "Select a server near you"
-#~ msgstr "தங்களுக்கு அருகாமையிலுள்ள வழங்கியினைத் தேர்வுச் செய்க"
+#~ msgid "Debian Involvement"
+#~ msgstr "டெபியன் ஈடுபாடு"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "தள ஆதரவாளரை அறிய"
+#~ msgid "More Info"
+#~ msgstr "மேலும் விவரங்களுக்கு"
+
+#~ msgid "Where"
+#~ msgstr "எங்கே"
+
+#~ msgid "When"
+#~ msgstr "எப்பொழுது"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "இணைப்பு இனி செல்லுபடியாகாதிருக்கலாம்"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "எதிர்வருபவை"
+
+#~ msgid "More information"
+#~ msgstr "மேறகொண்டு விவரமறிய"
diff --git a/tamil/po/vendors.ta.po b/tamil/po/vendors.ta.po
index 50fccdb7215..3d7046a6f44 100644
--- a/tamil/po/vendors.ta.po
+++ b/tamil/po/vendors.ta.po
@@ -68,29 +68,29 @@ msgstr "மூலம்"
msgid "and"
msgstr "மற்றும்"
-#~ msgid "Architectures:"
-#~ msgstr "கட்டமைப்புகள்:"
+#~ msgid "Vendor:"
+#~ msgstr "வழங்குவோர்:"
-#~ msgid "DVD Type:"
-#~ msgstr "பெருவட்டு வகை:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "டெபியன் பக்கத்துக்கான இணைப்பு:"
-#~ msgid "CD Type:"
-#~ msgstr "வட்டு வகை:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "டெபியன் பங்களிப்பினை ஊக்குவிக்கின்றது:"
-#~ msgid "email:"
-#~ msgstr "மின்னஞ்சல்:"
+#~ msgid "Country:"
+#~ msgstr "நாடு:"
#~ msgid "Ship International:"
#~ msgstr "சர்வதேச விநியோகம்:"
-#~ msgid "Country:"
-#~ msgstr "நாடு:"
+#~ msgid "email:"
+#~ msgstr "மின்னஞ்சல்:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "டெபியன் பங்களிப்பினை ஊக்குவிக்கின்றது:"
+#~ msgid "CD Type:"
+#~ msgstr "வட்டு வகை:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "டெபியன் பக்கத்துக்கான இணைப்பு:"
+#~ msgid "DVD Type:"
+#~ msgstr "பெருவட்டு வகை:"
-#~ msgid "Vendor:"
-#~ msgstr "வழங்குவோர்:"
+#~ msgid "Architectures:"
+#~ msgstr "கட்டமைப்புகள்:"
diff --git a/turkish/po/blends.tr.po b/turkish/po/blends.tr.po
index 64b8c15bf29..b00934651af 100644
--- a/turkish/po/blends.tr.po
+++ b/turkish/po/blends.tr.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/turkish/po/doc.tr.po b/turkish/po/doc.tr.po
index 3f001ee62bf..125eaebb522 100644
--- a/turkish/po/doc.tr.po
+++ b/turkish/po/doc.tr.po
@@ -36,8 +36,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -61,31 +61,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -97,7 +73,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -109,7 +85,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -117,6 +93,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Yazar"
@@ -169,10 +161,10 @@ msgstr "(sürüm <get-var version />)"
msgid "plain text"
msgstr "düz metin"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -197,12 +189,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -235,16 +221,8 @@ msgstr ""
msgid "PDF"
msgstr ""
-#, fuzzy
-#~| msgid ""
-#~| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-"
-#~| "var ddp_pkg_loc />."
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "<get-var ddp_pkg_loc /> SGML kaynak metnini indirmek için <a href=\"cvs"
-#~ "\">CVS</a> kullanın."
+#~ msgid "Language:"
+#~ msgstr "Dil:"
#~ msgid ""
#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
@@ -255,5 +233,13 @@ msgstr ""
#~ "versiyona bakabilir veya isterseniz <a href=\"cvs\">CVS</a> kullanarak "
#~ "SGML formatında kaynağı bilgisayarınıza indirebilirsiniz."
-#~ msgid "Language:"
-#~ msgstr "Dil:"
+#, fuzzy
+#~| msgid ""
+#~| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-"
+#~| "var ddp_pkg_loc />."
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "<get-var ddp_pkg_loc /> SGML kaynak metnini indirmek için <a href=\"cvs"
+#~ "\">CVS</a> kullanın."
diff --git a/turkish/po/organization.tr.po b/turkish/po/organization.tr.po
index aa945111094..b7ee3577c47 100644
--- a/turkish/po/organization.tr.po
+++ b/turkish/po/organization.tr.po
@@ -85,24 +85,24 @@ msgid "Officers"
msgstr "Ofis Üyeleri"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Dağıtım"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Tanıtım"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Destek ve Altyapı"
@@ -119,231 +119,229 @@ msgstr "Lider"
msgid "Technical Committee"
msgstr "Teknik Komite"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Sekreter"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Geliştirilen Projeler"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP Arşivleri"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
#, fuzzy
#| msgid "Release Assistants"
msgid "FTP Assistants"
msgstr "Sürüm Yardımcıları"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Ayrı paketler"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Sürüm Yönetimi"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Sürüm Notları"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Kalite Güvencesi"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Kurulum Sistemi Ekibi"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Sürüm Notları"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "CD imajları"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Üretim"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Destek ve Altyapı"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Sistem Yönetimi"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Belgelendirme"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
#, 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:178
-#, fuzzy
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "Kurulum Sistemi Ekibi"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Donanım Platformları"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Özel Yapılandırmalar"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Dizüstüler"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Güvenlik duvarları"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Gömülü sistemler"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Basınla İletişim"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Web Sayfaları"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Geliştirilen Projeler"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Olaylar"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Teknik Komite"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "İş Ortakları Programı"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Donanım Bağışları Koordinasyonu"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Kullanıcı desteği"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Hata Takip Sistemi"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Eposta Listeleri Yönetimi"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Yeni Geliştiriciler Başvuru Masası"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
#, fuzzy
#| msgid "Developer Accounts Managers"
msgid "Debian Account Managers"
msgstr "Geliştirici Hesapları Yöneticileri"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Anahtar halkası Yöneticileri (PGP ve GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Güvenlik Ekibi"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Danışmanlar Sayfası"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "CD Satıcıları Sayfası"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Kurallar"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Sistem Yönetimi"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -352,7 +350,7 @@ msgstr ""
"belirli bir paketin kurulumuna olan gereksinim gibi sorunlarla "
"karşılaştığınızda kullanacağınız adrestir."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -362,120 +360,137 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP Geliştirici Dizinleri Yönetimi"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Yansılar"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "DNS Yöneticisi"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Paket Takip Sistemi"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth yöneticileri"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Alioth yöneticileri"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Yedine yetmişe çocuklar için Debian"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Tıbbî uygulama ve araştırmalar için Debian"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Eğitim için Debian"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Resmî dairelerde Debian"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Özürlüler için Debian"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
#, 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 "Publicity"
-#~ msgstr "Tanıtım"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Eğitim için Debian"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "``Stable'' Sürüm Yöneticisi"
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Güvenlik Ekibi"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "``Stable'' Kurulum Sistemi"
+#~ msgid "Security Audit Project"
+#~ msgstr "Güvenlik Duyuruları Projesi"
-#~ msgid "Vendors"
-#~ msgstr "Satıcılar"
+#~ msgid "Mailing list"
+#~ msgstr "Mail listesi"
-#~ msgid "APT Team"
-#~ msgstr "APT Ekibi"
+#~ msgid "Installation"
+#~ msgstr "Kurulum"
-#~ msgid "Handhelds"
-#~ msgstr "Elde taşınabilirler"
+#~ msgid "Delegates"
+#~ msgstr "Temsilciler"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Eposta Liste Arşivleri"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Bu proje henüz resmî bir dahili Debian projesi değil, fakat bu yönde bir "
+#~ "niyet bildirilmiş durumda."
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Anahtar İmzalama Koordinasyonu"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian Çokluortam Dağıtımı"
-#~ msgid "Accountant"
-#~ msgstr "Sayman"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "İş dünyası için Debian GNU/Linux"
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Kâr amacı gütmeyen kurumlar için Debian"
#~ msgid "The Universal Operating System as your Desktop"
#~ msgstr "Masaüstünüz için Evrensel İşletim Sistemi"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Kâr amacı gütmeyen kurumlar için Debian"
+#~ msgid "Accountant"
+#~ msgstr "Sayman"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "İş dünyası için Debian GNU/Linux"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Anahtar İmzalama Koordinasyonu"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian Çokluortam Dağıtımı"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Eposta Liste Arşivleri"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Bu proje henüz resmî bir dahili Debian projesi değil, fakat bu yönde bir "
-#~ "niyet bildirilmiş durumda."
+#~ msgid "Handhelds"
+#~ msgstr "Elde taşınabilirler"
-#~ msgid "Delegates"
-#~ msgstr "Temsilciler"
+#~ msgid "APT Team"
+#~ msgstr "APT Ekibi"
-#~ msgid "Installation"
-#~ msgstr "Kurulum"
+#~ msgid "Vendors"
+#~ msgstr "Satıcılar"
-#~ msgid "Mailing list"
-#~ msgstr "Mail listesi"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "``Stable'' Kurulum Sistemi"
-#~ msgid "Security Audit Project"
-#~ msgstr "Güvenlik Duyuruları Projesi"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "``Stable'' Sürüm Yöneticisi"
+
+#~ msgid "Publicity"
+#~ msgstr "Tanıtım"
#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "Güvenlik Ekibi"
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "Kurulum Sistemi Ekibi"
diff --git a/turkish/po/others.tr.po b/turkish/po/others.tr.po
index 0abd3ff058b..0f3fca18cc0 100644
--- a/turkish/po/others.tr.po
+++ b/turkish/po/others.tr.po
@@ -358,88 +358,73 @@ msgstr "Sürüm"
msgid "URL"
msgstr "URL"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
-
-#~ msgid "Previous Talks:"
-#~ msgstr "Önceki Konuşmalar:"
-
-#~ msgid "Languages:"
-#~ msgstr "Diller:"
-
-#~ msgid "Location:"
-#~ msgstr "Yerler:"
-
-#~ msgid "Topics:"
-#~ msgstr "Konular:"
+#~ msgid "Wanted:"
+#~ msgstr "İstenenler:"
-#~ msgid "Q"
-#~ msgstr "S"
+#~ msgid "Who:"
+#~ msgstr "Kim:"
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "animasyonlu&nbsp;GIF&nbsp;içeren&nbsp;banner"
+#~ msgid "Architecture:"
+#~ msgstr "Mimari:"
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "yatay&nbsp;banner"
+#~ msgid "Specifications:"
+#~ msgstr "Özellikler:"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "dikey&nbsp;banner"
+#~ msgid "Where:"
+#~ msgstr "Neresi:"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "Sadece Debian Teknik Komitesi"
+#~ msgid "Name:"
+#~ msgstr "İsim:"
-#~ msgid "developers only"
-#~ msgstr "sadece geliştiricilere açık"
+#~ msgid "Company:"
+#~ msgstr "Şirket:"
-#~ msgid "rc2"
-#~ msgstr "rc2"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "closed"
-#~ msgstr "kapalı"
+#~ msgid "or"
+#~ msgstr "veya"
-#~ msgid "open"
-#~ msgstr "açık"
+#~ msgid "Email:"
+#~ msgstr "Eposta:"
-#~ msgid "Unsubscribe"
-#~ msgstr "Üyelikten Çık"
+#~ msgid "Rates:"
+#~ msgstr "Tarifeler:"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Lütfen üyelikten çıkmak istediğiniz listeleri seçin:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Herhangi bir yerde hizmet verebilecekler"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Eposta göndererek nasıl liste üyeliğinden çıkabileceğinize dair bilgileri "
-#~ "<a href=\"./#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. "
-#~ "Başka listelere de üye olmak isterseniz ayrıca bir <a href=\"subscribe"
-#~ "\">üyelik formu</a> mevcuttur."
+#~ "<total_country> ülkede toplam <total_consultant> Debian danışmanı "
+#~ "bulunmaktadır."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Eposta Liste Üyeliğinden Çıkma"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Eposta Listesi Üyeliği"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
-#~ "Lütfen <a href=\"./#ads\">Debian eposta listeleri reklam politikasına</a> "
-#~ "saygılı olunuz."
-
-#~ msgid "Clear"
-#~ msgstr "Temizle"
+#~ "Eposta kullanarak nasıl üye olacağınıza ait bilgileri <a href=\"./"
+#~ "#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. Liste "
+#~ "üyeliklerden çıkmak için ayrıca <a href=\"unsubscribe\">üyelikten çıkma "
+#~ "formu</a> mevcuttur."
-#~ msgid "Subscribe"
-#~ msgstr "Üye ol"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Lütfen üye olmak istediğiniz listeleri seçin:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Eposta adresiniz:"
+#~ msgid "No description given"
+#~ msgstr "Açıklama verilmemiş"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "salt-okunabilir, derlenmiş sürüm."
+#~ msgid "Moderated:"
+#~ msgstr "Kısıtlanmış:"
-#~ msgid "Subscription:"
-#~ msgstr "Üyelik:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Sadece üyeler eposta gönderebilir."
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -447,70 +432,85 @@ msgstr "URL"
#~ "Bu listeye sadece bir Debian geliştiricisi tarafından imzalanmış iletiler "
#~ "kabul edilecektir."
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Sadece üyeler eposta gönderebilir."
+#~ msgid "Subscription:"
+#~ msgstr "Üyelik:"
-#~ msgid "Moderated:"
-#~ msgstr "Kısıtlanmış:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "salt-okunabilir, derlenmiş sürüm."
-#~ msgid "No description given"
-#~ msgstr "Açıklama verilmemiş"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Eposta adresiniz:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Lütfen üye olmak istediğiniz listeleri seçin:"
+#~ msgid "Subscribe"
+#~ msgstr "Üye ol"
+
+#~ msgid "Clear"
+#~ msgstr "Temizle"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Eposta kullanarak nasıl üye olacağınıza ait bilgileri <a href=\"./"
-#~ "#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. Liste "
-#~ "üyeliklerden çıkmak için ayrıca <a href=\"unsubscribe\">üyelikten çıkma "
-#~ "formu</a> mevcuttur."
+#~ "Lütfen <a href=\"./#ads\">Debian eposta listeleri reklam politikasına</a> "
+#~ "saygılı olunuz."
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Eposta Listesi Üyeliği"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Eposta Liste Üyeliğinden Çıkma"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
#~ msgstr ""
-#~ "<total_country> ülkede toplam <total_consultant> Debian danışmanı "
-#~ "bulunmaktadır."
+#~ "Eposta göndererek nasıl liste üyeliğinden çıkabileceğinize dair bilgileri "
+#~ "<a href=\"./#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. "
+#~ "Başka listelere de üye olmak isterseniz ayrıca bir <a href=\"subscribe"
+#~ "\">üyelik formu</a> mevcuttur."
-#~ msgid "Willing to Relocate"
-#~ msgstr "Herhangi bir yerde hizmet verebilecekler"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Lütfen üyelikten çıkmak istediğiniz listeleri seçin:"
-#~ msgid "Rates:"
-#~ msgstr "Tarifeler:"
+#~ msgid "Unsubscribe"
+#~ msgstr "Üyelikten Çık"
-#~ msgid "Email:"
-#~ msgstr "Eposta:"
+#~ msgid "open"
+#~ msgstr "açık"
-#~ msgid "or"
-#~ msgstr "veya"
+#~ msgid "closed"
+#~ msgstr "kapalı"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "rc2"
+#~ msgstr "rc2"
-#~ msgid "Company:"
-#~ msgstr "Şirket:"
+#~ msgid "developers only"
+#~ msgstr "sadece geliştiricilere açık"
-#~ msgid "Name:"
-#~ msgstr "İsim:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "Sadece Debian Teknik Komitesi"
-#~ msgid "Where:"
-#~ msgstr "Neresi:"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "dikey&nbsp;banner"
-#~ msgid "Specifications:"
-#~ msgstr "Özellikler:"
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "yatay&nbsp;banner"
-#~ msgid "Architecture:"
-#~ msgstr "Mimari:"
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "animasyonlu&nbsp;GIF&nbsp;içeren&nbsp;banner"
-#~ msgid "Who:"
-#~ msgstr "Kim:"
+#~ msgid "Q"
+#~ msgstr "S"
-#~ msgid "Wanted:"
-#~ msgstr "İstenenler:"
+#~ msgid "Topics:"
+#~ msgstr "Konular:"
+
+#~ msgid "Location:"
+#~ msgstr "Yerler:"
+
+#~ msgid "Languages:"
+#~ msgstr "Diller:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Önceki Konuşmalar:"
+
+#~ 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 4bf44c6617a..6d1e8018a15 100644
--- a/turkish/po/partners.tr.po
+++ b/turkish/po/partners.tr.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/turkish/po/ports.tr.po b/turkish/po/ports.tr.po
index 29d691bd471..dbb05005e6b 100644
--- a/turkish/po/ports.tr.po
+++ b/turkish/po/ports.tr.po
@@ -123,65 +123,68 @@ msgstr "Debian PowerPC"
msgid "Debian for Sparc"
msgstr "Debian Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Dizüstü bilgisayarlar için Debian"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPS"
-#~ msgid "Main"
-#~ msgstr "Temel"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD denetleyici, Kompakt Flash, UART, Paralel, RTC, Klavye, USB, "
+#~ "Touchpad, Audio"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Kompakt Flash, UART, Paralel, RTC, Ses, PCIC"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr "Mips 16, Klavye, TouchPanel, Ses, Kompakt Flash, UART, Paralel"
-#~ msgid "Vendor/Name"
-#~ msgstr "Üretici/İsim"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Date announced"
-#~ msgstr "Duyurulduğu tarihi"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "Yonga üzerinde 256 L2 önbellek"
-#~ msgid "Clock"
-#~ msgstr "Saat"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bit harici yol, harici L2 önbellek"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bit harici yol"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bit harici yol"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Sayısal I/O"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "FPU yok, SDRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
-#~ msgid "Specials"
-#~ msgstr "Özel"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, IrDA"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "FPU (R2010) yok, harici önbellek"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "FPU (R3010)"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "FPU yok, SDRAMC, ROMC, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Sanal endekslenmiş L1 önbellek, L2 önbellek denetleyici"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
-#~ msgid "External L1 cache"
-#~ msgstr "Harici L1 önbellek"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "Çoklu yongalı CPU"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı, I2C, LCD Denetleyici"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -190,65 +193,62 @@ msgstr "Debian Sparc"
#~ "Mips16 isa uzantısı, FPU yok, 512k flash, 16k bellek, DMAC, UART, "
#~ "Zamanlayıcı, I2C, Watchdog"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı, I2C, LCD Denetleyici"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "Çoklu yongalı CPU"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı"
+#~ msgid "External L1 cache"
+#~ msgstr "Harici L1 önbellek"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Sanal endekslenmiş L1 önbellek, L2 önbellek denetleyici"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "FPU yok, SDRAMC, ROMC, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "FPU (R3010)"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "FPU (R2010) yok, harici önbellek"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, IrDA"
+#~ msgid "Specials"
+#~ msgstr "Özel"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "FPU yok, SDRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Sayısal I/O"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bit harici yol"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bit harici yol"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bit harici yol, harici L2 önbellek"
+#~ msgid "Clock"
+#~ msgstr "Saat"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "Yonga üzerinde 256 L2 önbellek"
+#~ msgid "Date announced"
+#~ msgstr "Duyurulduğu tarihi"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Vendor/Name"
+#~ msgstr "Üretici/İsim"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr "Mips 16, Klavye, TouchPanel, Ses, Kompakt Flash, UART, Paralel"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Kompakt Flash, UART, Paralel, RTC, Ses, PCIC"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD denetleyici, Kompakt Flash, UART, Paralel, RTC, Klavye, USB, "
-#~ "Touchpad, Audio"
+#~ msgid "Main"
+#~ msgstr "Temel"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Dizüstü bilgisayarlar için Debian"
diff --git a/turkish/po/stats.tr.po b/turkish/po/stats.tr.po
index 7939788b810..41edcb81517 100644
--- a/turkish/po/stats.tr.po
+++ b/turkish/po/stats.tr.po
@@ -28,208 +28,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/turkish/po/templates.tr.po b/turkish/po/templates.tr.po
index d7512afc986..57fc3dedf7b 100644
--- a/turkish/po/templates.tr.po
+++ b/turkish/po/templates.tr.po
@@ -221,11 +221,11 @@ msgstr "sürüm 2.2"
#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
#| "page</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Web sitesiyle ilgili bir sorunu bildirmek için <a href=\"mailto:debian-"
"www@lists.debian.org\">debian-www@lists.debian.org</a> eposta adresine "
@@ -537,6 +537,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Not:</em> Bu çevirinin özgün hali artık mevcut değil."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -547,493 +551,493 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
-#~ msgid "More information"
-#~ msgstr "Daha fazla bilgi için"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Çok Yakında"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "bağlantı artık geçerli olmayabilir"
-
-#~ msgid "When"
-#~ msgstr "Ne Zaman"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Site sponsorunu ziyaret edin"
-#~ msgid "Where"
-#~ msgstr "Nerede"
+#~ msgid "Select a server near you"
+#~ msgstr "Yakınınızda bir sunucu seçin"
-#~ msgid "More Info"
-#~ msgstr "Daha fazla bilgi için"
+#~ msgid "More information:"
+#~ msgstr "Daha fazla bilgi:"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debian Katılım"
+#~ msgid "Taken by:"
+#~ msgstr "Üstlenen:"
-#~ msgid "Main Coordinator"
-#~ msgstr "Ana Koordinatör"
+#~ msgid "Nobody"
+#~ msgstr "Hiçkimse"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Proje</th><th>Koordinatörü</th>"
+#~ msgid "Rating:"
+#~ msgstr "Önemi:"
-#~ msgid "Related Links"
-#~ msgstr "İlgili bağlantılar"
+#~ msgid "List of Consultants"
+#~ msgstr "Danışman Listesi"
-#~ msgid "Latest News"
-#~ msgstr "Güncel Haberler"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "<a href=\"./\">Debian danışmanlar sayfası</a>'na dönüş."
-#~ msgid "Download calendar entry"
-#~ msgstr "Takvim girdisini indir"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Diğer <a href=\"./\">Debian haberlerine</a> veya <a href=\"m4_HOME/"
-#~ "\">Debian ana sayfasına</a> dönüş."
+#, fuzzy
+#~| msgid "download with jigdo"
+#~ msgid "Download with Jigdo"
+#~ msgstr "jigdo ile indir"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (ölü bağlantı)"
+#, fuzzy
+#~| msgid "download via http/ftp"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "http/ftp ile indir"
#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
-#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
-#~ "listesine</a> üye olmanız yeterlidir."
+#~| msgid "Network install"
+#~ msgid "Network Install"
+#~ msgstr "Ağdan kurulum"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "Bu bültenin <a href=\"../../\">Eski sayıları</a> mevcut."
+#, fuzzy
+#~| msgid "<void id=\"dc_faq\" />faq"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_faq\" />sss"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_misc\" />misc"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />çeşitli"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_faq\" />faq"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_faq\" />sss"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_misc\" />misc"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_misc\" />çeşitli"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_misc\" />misc"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_misc\" />çeşitli"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />%s tarafından çevirildi."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD ekibi"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />%s tarafından çevirildi."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_cd"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />%s tarafından çevirildi."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />sss"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />%s tarafından çevirildi."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "List of Speakers"
-#~ msgstr "Konuşmacı Listesi"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
+#~ msgid "buy"
+#~ msgstr "satın_al"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
-#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
-#~ "listesine</a> üye olmanız yeterlidir."
+#~ msgid "net_install"
+#~ msgstr "ağdan_kurulum"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />çeşitli"
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~ "CD/DVD'ler için İngilizce dilinde <a href=\"/MailingLists/disclaimer"
+#~ "\">kamuya açık eposta listesi</a>:"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a> tarafından düzenlendi."
+#, fuzzy
+#~| msgid "Donations"
+#~ msgid "Nominations"
+#~ msgstr "Bağışlar"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#, fuzzy
+#~| msgid "Debian CD team"
+#~ msgid "Debate"
+#~ msgstr "Debian CD ekibi"
-#~ msgid "No requests for adoption"
-#~ msgstr "Herhangi bir el değiştirme talebi yok"
+#, fuzzy
+#~| msgid "proposed"
+#~ msgid "Proposer"
+#~ msgstr "önerilen"
-#~ msgid "No orphaned packages"
-#~ msgstr "Sahipsiz bırakılmış bir paket yok"
+#, fuzzy
+#~| msgid "Discussion"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Değerlendirme"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "El değiştirmeyi bekleyen bir paket yok"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Sponsor Aranıyor"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Hazırlanmayı bekleyen bir paket yok"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Fikir&nbsp;Alışverişi&nbsp;Sırasında"
-#~ msgid "No Requested packages"
-#~ msgstr "İstenmiş bir paket yok"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Açık&nbsp;Anketler"
-#~ msgid "No help requested"
-#~ msgstr "Herhangi bir yardım istenmemiş"
+#~ msgid "Decided"
+#~ msgstr "Kararlaştırılan"
-#~ msgid "in adoption since today."
-#~ msgstr "bugün itibarıyla el değiştirme sürecinde"
+#~ msgid "Withdrawn"
+#~ msgstr "Geri alınmış"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "dünden beri el değiştirme sürecinde"
+#~ msgid "Other"
+#~ msgstr "Diğer"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s günden beri el değiştirme sürecinde"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Ana&nbsp;Anket&nbsp;Sayfası"
-#~ msgid "in preparation since today."
-#~ msgstr "bugün itibarıyla hazırlanmaya başladı"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Nasıl"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "dünden beri hazırlanıyor"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Öneri&nbsp;Gönder"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s günden beri hazırlanıyor"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Öneri&nbsp;Değiştir"
-#~ msgid "requested today."
-#~ msgstr "bugün istenmiş"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Öneri&nbsp;İzle"
-#~ msgid "requested yesterday."
-#~ msgstr "dün istenmiş"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Sonuçlara&nbsp;Gözat"
-#~ msgid "requested %s days ago."
-#~ msgstr "%s gün önce istenmiş"
+#~ msgid "Vote"
+#~ msgstr "Oyla"
-#~ msgid "package info"
-#~ msgstr "paket bilgisi"
+#~ msgid ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
+#~ msgstr ""
+#~ "Yukarıdaki dosyaların MD5 checksum değerlerini <a href=\"%attributes"
+#~ "\">orjinal duyuru</a>'dan edinebilirsiniz."
-#~ msgid "buy pre-made images"
-#~ msgstr "önceden hazırlanmış imajları satın al"
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Mimari-bağımsız parça:"
-#~ msgid "network install"
-#~ msgstr "ağ üzerinden kurulum"
+#~ msgid "Source:"
+#~ msgstr "Kaynak:"
-#~ msgid "License Information"
-#~ msgstr "Lisans Bilgileri"
+#~ msgid "Fixed in"
+#~ msgstr "Düzeltilmiş hali"
-#~ msgid "DLS Index"
-#~ msgstr "DLÖ Listesi"
+#~ msgid "Vulnerable"
+#~ msgstr "Etkilenebilir"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debian Güvenlik Duyuruları"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG SSS"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debian Güvenlik Duyurusu"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal Arşivi"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Diğer <a href=\"./\">Debian haberlerine</a> geri dön."
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Bizimle iletişim sağlamak için Debian <a href=\"m4_HOME/contact\">kontak "
+#~ "sayfası</a>'nı ziyaret edin"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Sürüm %s: %s"
+#~ msgid "discussed"
+#~ msgstr "görüşülmüş"
-#~ msgid "Date published"
-#~ msgstr "Yayımlandığı tarih"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Debian Lisans Özetlerine (DLÖ) genel bir bakış için <a href=\"./\">lisans "
+#~ "bilgileri</a> sayfasına bakın."
-#~ msgid "License"
-#~ msgstr "Lisans"
+#~ msgid "Not Redistributable"
+#~ msgstr "Dağıtılabilir durumda değil"
-#~ msgid "Version"
-#~ msgstr "Sürüm"
+#~ msgid "Non-Free"
+#~ msgstr "Özgür-Olmayan"
-#~ msgid "Summary"
-#~ msgstr "Özet"
+#~ msgid "Free"
+#~ msgstr "Özgür"
-#~ msgid "Justification"
-#~ msgstr "Gerekçe"
+#~ msgid "not redistributable"
+#~ msgstr "dağıtılabilir durumda değil"
-#~ msgid "Original Summary"
-#~ msgstr "Özgün Özet"
+#~ msgid "non-free"
+#~ msgstr "özgür-değil"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "<summary-author/> tarafından hazırlanmış özetin özgün hali <a href="
-#~ "\"<summary-url/>\">liste arşivlerinde</a> bulunabilir."
+#~ msgid "free"
+#~ msgstr "özgür"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Bu özet <summary-author/> tarafından hazırlanmıştır."
+#~ msgid "License text"
+#~ msgstr "Lisans metni"
#~ msgid "License text (translated)"
#~ msgstr "Lisans metni (çeviri)"
-#~ msgid "License text"
-#~ msgstr "Lisans metni"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Bu özet <summary-author/> tarafından hazırlanmıştır."
-#~ msgid "free"
-#~ msgstr "özgür"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "<summary-author/> tarafından hazırlanmış özetin özgün hali <a href="
+#~ "\"<summary-url/>\">liste arşivlerinde</a> bulunabilir."
-#~ msgid "non-free"
-#~ msgstr "özgür-değil"
+#~ msgid "Original Summary"
+#~ msgstr "Özgün Özet"
-#~ msgid "not redistributable"
-#~ msgstr "dağıtılabilir durumda değil"
+#~ msgid "Justification"
+#~ msgstr "Gerekçe"
-#~ msgid "Free"
-#~ msgstr "Özgür"
+#~ msgid "Summary"
+#~ msgstr "Özet"
-#~ msgid "Non-Free"
-#~ msgstr "Özgür-Olmayan"
+#~ msgid "Version"
+#~ msgstr "Sürüm"
-#~ msgid "Not Redistributable"
-#~ msgstr "Dağıtılabilir durumda değil"
+#~ msgid "License"
+#~ msgstr "Lisans"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Debian Lisans Özetlerine (DLÖ) genel bir bakış için <a href=\"./\">lisans "
-#~ "bilgileri</a> sayfasına bakın."
+#~ msgid "Date published"
+#~ msgstr "Yayımlandığı tarih"
-#~ msgid "discussed"
-#~ msgstr "görüşülmüş"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Sürüm %s: %s"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Bizimle iletişim sağlamak için Debian <a href=\"m4_HOME/contact\">kontak "
-#~ "sayfası</a>'nı ziyaret edin"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Diğer <a href=\"./\">Debian haberlerine</a> geri dön."
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal Arşivi"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debian Güvenlik Duyurusu"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG SSS"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debian Güvenlik Duyuruları"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Vulnerable"
-#~ msgstr "Etkilenebilir"
+#~ msgid "DLS Index"
+#~ msgstr "DLÖ Listesi"
-#~ msgid "Fixed in"
-#~ msgstr "Düzeltilmiş hali"
+#~ msgid "License Information"
+#~ msgstr "Lisans Bilgileri"
-#~ msgid "Source:"
-#~ msgstr "Kaynak:"
+#~ msgid "network install"
+#~ msgstr "ağ üzerinden kurulum"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Mimari-bağımsız parça:"
+#~ msgid "buy pre-made images"
+#~ msgstr "önceden hazırlanmış imajları satın al"
-#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
-#~ msgstr ""
-#~ "Yukarıdaki dosyaların MD5 checksum değerlerini <a href=\"%attributes"
-#~ "\">orjinal duyuru</a>'dan edinebilirsiniz."
+#~ msgid "package info"
+#~ msgstr "paket bilgisi"
-#~ msgid "Vote"
-#~ msgstr "Oyla"
+#~ msgid "requested %s days ago."
+#~ msgstr "%s gün önce istenmiş"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Sonuçlara&nbsp;Gözat"
+#~ msgid "requested yesterday."
+#~ msgstr "dün istenmiş"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Öneri&nbsp;İzle"
+#~ msgid "requested today."
+#~ msgstr "bugün istenmiş"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Öneri&nbsp;Değiştir"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s günden beri hazırlanıyor"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Öneri&nbsp;Gönder"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "dünden beri hazırlanıyor"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Nasıl"
+#~ msgid "in preparation since today."
+#~ msgstr "bugün itibarıyla hazırlanmaya başladı"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Ana&nbsp;Anket&nbsp;Sayfası"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s günden beri el değiştirme sürecinde"
-#~ msgid "Other"
-#~ msgstr "Diğer"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "dünden beri el değiştirme sürecinde"
-#~ msgid "Withdrawn"
-#~ msgstr "Geri alınmış"
+#~ msgid "in adoption since today."
+#~ msgstr "bugün itibarıyla el değiştirme sürecinde"
-#~ msgid "Decided"
-#~ msgstr "Kararlaştırılan"
+#~ msgid "No help requested"
+#~ msgstr "Herhangi bir yardım istenmemiş"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Açık&nbsp;Anketler"
+#~ msgid "No Requested packages"
+#~ msgstr "İstenmiş bir paket yok"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Fikir&nbsp;Alışverişi&nbsp;Sırasında"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Hazırlanmayı bekleyen bir paket yok"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Sponsor Aranıyor"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "El değiştirmeyi bekleyen bir paket yok"
-#, fuzzy
-#~| msgid "Discussion"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Değerlendirme"
+#~ msgid "No orphaned packages"
+#~ msgstr "Sahipsiz bırakılmış bir paket yok"
-#, fuzzy
-#~| msgid "proposed"
-#~ msgid "Proposer"
-#~ msgstr "önerilen"
+#~ msgid "No requests for adoption"
+#~ msgstr "Herhangi bir el değiştirme talebi yok"
-#, fuzzy
-#~| msgid "Debian CD team"
-#~ msgid "Debate"
-#~ msgstr "Debian CD ekibi"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#, fuzzy
-#~| msgid "Donations"
-#~ msgid "Nominations"
-#~ msgstr "Bağışlar"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a> tarafından düzenlendi."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "CD/DVD'ler için İngilizce dilinde <a href=\"/MailingLists/disclaimer"
-#~ "\">kamuya açık eposta listesi</a>:"
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />çeşitli"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#~ msgid "net_install"
-#~ msgstr "ağdan_kurulum"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
+#~ "listesine</a> üye olmanız yeterlidir."
-#~ msgid "buy"
-#~ msgstr "satın_al"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "List of Speakers"
+#~ msgstr "Konuşmacı Listesi"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />%s tarafından çevirildi."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />sss"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />%s tarafından çevirildi."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_cd"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />%s tarafından çevirildi."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD ekibi"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />%s tarafından çevirildi."
#, fuzzy
-#~| msgid "<void id=\"dc_misc\" />misc"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_misc\" />çeşitli"
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
#, fuzzy
-#~| msgid "<void id=\"dc_misc\" />misc"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_misc\" />çeşitli"
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a> tarafından düzenlendi."
#, fuzzy
-#~| msgid "<void id=\"dc_faq\" />faq"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_faq\" />sss"
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
#, fuzzy
-#~| msgid "<void id=\"dc_misc\" />misc"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />çeşitli"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#, fuzzy
-#~| msgid "<void id=\"dc_faq\" />faq"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_faq\" />sss"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "Bu bültenin <a href=\"../../\">Eski sayıları</a> mevcut."
#, fuzzy
-#~| msgid "Network install"
-#~ msgid "Network Install"
-#~ msgstr "Ağdan kurulum"
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
+#~ "listesine</a> üye olmanız yeterlidir."
-#, fuzzy
-#~| msgid "download via http/ftp"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "http/ftp ile indir"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (ölü bağlantı)"
-#, fuzzy
-#~| msgid "download with jigdo"
-#~ msgid "Download with Jigdo"
-#~ msgstr "jigdo ile indir"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Diğer <a href=\"./\">Debian haberlerine</a> veya <a href=\"m4_HOME/"
+#~ "\">Debian ana sayfasına</a> dönüş."
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Download calendar entry"
+#~ msgstr "Takvim girdisini indir"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "<a href=\"./\">Debian danışmanlar sayfası</a>'na dönüş."
+#~ msgid "Latest News"
+#~ msgstr "Güncel Haberler"
-#~ msgid "List of Consultants"
-#~ msgstr "Danışman Listesi"
+#~ msgid "Related Links"
+#~ msgstr "İlgili bağlantılar"
-#~ msgid "Rating:"
-#~ msgstr "Önemi:"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Proje</th><th>Koordinatörü</th>"
-#~ msgid "Nobody"
-#~ msgstr "Hiçkimse"
+#~ msgid "Main Coordinator"
+#~ msgstr "Ana Koordinatör"
-#~ msgid "Taken by:"
-#~ msgstr "Üstlenen:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debian Katılım"
-#~ msgid "More information:"
-#~ msgstr "Daha fazla bilgi:"
+#~ msgid "More Info"
+#~ msgstr "Daha fazla bilgi için"
-#~ msgid "Select a server near you"
-#~ msgstr "Yakınınızda bir sunucu seçin"
+#~ msgid "Where"
+#~ msgstr "Nerede"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Site sponsorunu ziyaret edin"
+#~ msgid "When"
+#~ msgstr "Ne Zaman"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "bağlantı artık geçerli olmayabilir"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Çok Yakında"
+
+#~ msgid "More information"
+#~ msgstr "Daha fazla bilgi için"
diff --git a/turkish/po/vendors.tr.po b/turkish/po/vendors.tr.po
index 19cb110f7eb..0f6f5ac4463 100644
--- a/turkish/po/vendors.tr.po
+++ b/turkish/po/vendors.tr.po
@@ -85,71 +85,71 @@ msgstr "kaynak"
msgid "and"
msgstr "ve"
-#~ msgid "Official CD"
-#~ msgstr "Resmi CD"
+#~ msgid "Vendor:"
+#~ msgstr "Satıcı:"
-#~ msgid "Development Snapshot"
-#~ msgstr "Geliştirme Sürümü"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian Sayfası için URL:"
-#~ msgid "Vendor Release"
-#~ msgstr "Satıcı Sürümü"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Debian'a Katkıya İzin veriyor:"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Çoklu Dağıtım"
+#~ msgid "Country:"
+#~ msgstr "Ülke:"
-#~ msgid "non-US included"
-#~ msgstr "non-US dahil"
+#~ msgid "Ship International:"
+#~ msgstr "Uluslararası "
-#~ msgid "non-free included"
-#~ msgstr "non-free dahil"
+#~ msgid "email:"
+#~ msgstr "eposta:"
-#~ msgid "contrib included"
-#~ msgstr "contrib dahil"
+#~ msgid "CD Type:"
+#~ msgstr "CD tipi:"
-#~ msgid "vendor additions"
-#~ msgstr "satıcı eklemeleri"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD tipi:"
-#~ msgid "Custom Release"
-#~ msgstr "Özel Sürüm"
+#~ msgid "Architectures:"
+#~ msgstr "Mimariler:"
-#~ msgid "reseller of $var"
-#~ msgstr "$var için tekrar dağıtıcı"
+#~ msgid "updated monthly"
+#~ msgstr "aylık güncelleniyor"
-#~ msgid "reseller"
-#~ msgstr "tekrar dağıtıcı"
+#~ msgid "updated twice weekly"
+#~ msgstr "haftada iki defa güncelleniyor"
#~ msgid "updated weekly"
#~ msgstr "haftalık güncelleniyor"
-#~ msgid "updated twice weekly"
-#~ msgstr "haftada iki defa güncelleniyor"
+#~ msgid "reseller"
+#~ msgstr "tekrar dağıtıcı"
-#~ msgid "updated monthly"
-#~ msgstr "aylık güncelleniyor"
+#~ msgid "reseller of $var"
+#~ msgstr "$var için tekrar dağıtıcı"
-#~ msgid "Architectures:"
-#~ msgstr "Mimariler:"
+#~ msgid "Custom Release"
+#~ msgstr "Özel Sürüm"
-#~ msgid "DVD Type:"
-#~ msgstr "DVD tipi:"
+#~ msgid "vendor additions"
+#~ msgstr "satıcı eklemeleri"
-#~ msgid "CD Type:"
-#~ msgstr "CD tipi:"
+#~ msgid "contrib included"
+#~ msgstr "contrib dahil"
-#~ msgid "email:"
-#~ msgstr "eposta:"
+#~ msgid "non-free included"
+#~ msgstr "non-free dahil"
-#~ msgid "Ship International:"
-#~ msgstr "Uluslararası "
+#~ msgid "non-US included"
+#~ msgstr "non-US dahil"
-#~ msgid "Country:"
-#~ msgstr "Ülke:"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Çoklu Dağıtım"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Debian'a Katkıya İzin veriyor:"
+#~ msgid "Vendor Release"
+#~ msgstr "Satıcı Sürümü"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "Debian Sayfası için URL:"
+#~ msgid "Development Snapshot"
+#~ msgstr "Geliştirme Sürümü"
-#~ msgid "Vendor:"
-#~ msgstr "Satıcı:"
+#~ msgid "Official CD"
+#~ msgstr "Resmi CD"
diff --git a/ukrainian/po/blends.uk.po b/ukrainian/po/blends.uk.po
index 0d295c71514..5ef0be6e93f 100644
--- a/ukrainian/po/blends.uk.po
+++ b/ukrainian/po/blends.uk.po
@@ -29,13 +29,25 @@ msgstr "Похідні"
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+"Мета Debian Astro полягає в розробці операційної системи на базі Debian, що "
+"відповідає вимогам як професійних астрономів, так і астрономів-любителів. "
+"Вона об'єднує велику кількість програмних пакетів, що включають контроль "
+"телескопів, зменшення даних, представлення та інші поля."
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
"Метою DebiChem є зробити Debian гарною платформою для хіміків у їх "
"повсякденній роботі."
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
@@ -43,7 +55,7 @@ msgstr ""
"Мета Debian Games полягає у забезпеченні ігор в Debian від аркад та пригод "
"до імітації та стратегії."
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
@@ -51,7 +63,7 @@ msgstr ""
"Метою Debian Edu є зробити систему Debian придатною для використання у "
"навчанні та в школах."
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
@@ -59,7 +71,7 @@ msgstr ""
"Метою Debian GIS є розробка Debian у найкраще розповсюдження для додатків та "
"користувачів географічної інформаційної системи."
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
@@ -67,7 +79,7 @@ msgstr ""
"Мета Debian Junior - зробити Debian операційною системою, якою зможуть "
"насолоджуватися діти."
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -80,7 +92,7 @@ msgstr ""
"медичної візуалізації, біоінформатики, ІТ-інфраструктури клініки та ін. в ОС "
"Debian."
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
@@ -88,7 +100,7 @@ msgstr ""
"Мета Debian Multimedia - зробити Debian гарною платформою для роботи з аудіо "
"та мультимедіа."
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -107,25 +119,13 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-"Мета Debian Astro полягає в розробці операційної системи на базі Debian, що "
-"відповідає вимогам як професійних астрономів, так і астрономів-любителів. "
-"Вона об'єднує велику кількість програмних пакетів, що включають контроль "
-"телескопів, зменшення даних, представлення та інші поля."
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
"Метою Debian Design є забезпечення додатків для дизайнерів. Це включає "
"графічний дизайн, веб-дизайн та мультимедійний дизайн."
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -140,7 +140,7 @@ msgstr ""
"розвиток технологій у багатьох областях та регіонах, таких, як Африка, "
"Афганістан, Індонезія, В'єтнам, використовуючи Debian."
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -155,7 +155,7 @@ msgstr ""
"замінити бездротовий маршрутизатор таким чином, щоб дані залишалися з "
"користувачами."
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
@@ -163,7 +163,7 @@ msgstr ""
"Мета Debian Hamradio полягає у підтримці потреб радіолюбителів у Debian, "
"надаючи програми журналювання, режиму даних, пакетного режиму тощо."
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/ukrainian/po/bugs.uk.po b/ukrainian/po/bugs.uk.po
index 168e489b004..c24a564e03a 100644
--- a/ukrainian/po/bugs.uk.po
+++ b/ukrainian/po/bugs.uk.po
@@ -29,7 +29,6 @@ msgstr "з міткою"
#: ../../english/Bugs/pkgreport-opts.inc:23
#: ../../english/Bugs/pkgreport-opts.inc:63
#: ../../english/Bugs/pkgreport-opts.inc:97
-#| msgid "severities"
msgid "with severity"
msgstr "з рівнем важливості"
@@ -50,7 +49,6 @@ msgid "owned by"
msgstr "які належать"
#: ../../english/Bugs/pkgreport-opts.inc:38
-#| msgid "status"
msgid "with status"
msgstr "з станом"
@@ -105,7 +103,6 @@ msgid "raw"
msgstr "сирий"
#: ../../english/Bugs/pkgreport-opts.inc:131
-#| msgid "sarge"
msgid "age"
msgstr "вік"
@@ -122,7 +119,6 @@ msgid "Reverse Pending"
msgstr "Очікуючі, у зворотньому порядку"
#: ../../english/Bugs/pkgreport-opts.inc:140
-#| msgid "Reverse order of:"
msgid "Reverse Severity"
msgstr "В зворотному порядку по важливості"
@@ -155,12 +151,10 @@ msgid "unstable"
msgstr "нестабільний"
#: ../../english/Bugs/pkgreport-opts.inc:152
-#| msgid "archived bugs"
msgid "Unarchived"
msgstr "розархівовані"
#: ../../english/Bugs/pkgreport-opts.inc:155
-#| msgid "archived bugs"
msgid "Archived"
msgstr "заархівовані"
@@ -168,146 +162,146 @@ msgstr "заархівовані"
msgid "Archived and Unarchived"
msgstr "Заархівовані та розархівовані"
-#~ msgid "Flags:"
-#~ msgstr "Прапорці:"
-
-#~ msgid "active bugs"
-#~ msgstr "активні помилки"
+#~ msgid "Exclude tag:"
+#~ msgstr "Не включаючи мітки:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "показувати злиті помилки лише раз"
+#~ msgid "Include tag:"
+#~ msgstr "Включаючи мітки:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "не впорядковувати по стану чи важливості"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "не показувати зміст в заголовку"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "не показувати статистику в кінці"
+#~ msgid "wontfix"
+#~ msgstr "wontfix"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible"
-#~ msgid "Package version:"
-#~ msgstr "Версія пакунка:"
+#~ msgid "security"
+#~ msgstr "security"
-#~ msgid "Distribution:"
-#~ msgstr "Дистрибутив:"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "bugs"
-#~ msgstr "помилки"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
-#~ msgid "open"
-#~ msgstr "відкриті"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "forwarded"
-#~ msgstr "переслані"
+#~ msgid "help"
+#~ msgstr "help"
-#~ msgid "pending"
-#~ msgstr "в очікуванні"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
-#~ msgid "fixed"
-#~ msgstr "виправлені"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental"
-#~ msgid "done"
-#~ msgstr "закриті"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "Включаючи стан:"
+#~ msgid "confirmed"
+#~ msgstr "confirmed"
-#~ msgid "Exclude status:"
-#~ msgstr "Не включаючи стан:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "критична"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "grave"
-#~ msgstr "дуже серйозна"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "serious"
-#~ msgstr "серйозна"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "важлива"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "minor"
-#~ msgstr "незначна"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "wishlist"
-#~ msgstr "побажання"
+#~ msgid "Exclude severity:"
+#~ msgstr "Не включаючи важливість"
#~ msgid "Include severity:"
#~ msgstr "Включаючи важливість"
-#~ msgid "Exclude severity:"
-#~ msgstr "Не включаючи важливість"
+#~ msgid "wishlist"
+#~ msgstr "побажання"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "незначна"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "важлива"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "серйозна"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "дуже серйозна"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "критична"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Не включаючи стан:"
-#~ msgid "confirmed"
-#~ msgstr "confirmed"
+#~ msgid "Include status:"
+#~ msgstr "Включаючи стан:"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "закриті"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental"
+#~ msgid "fixed"
+#~ msgstr "виправлені"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "pending"
+#~ msgstr "в очікуванні"
-#~ msgid "help"
-#~ msgstr "help"
+#~ msgid "forwarded"
+#~ msgstr "переслані"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "open"
+#~ msgstr "відкриті"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "bugs"
+#~ msgstr "помилки"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "Distribution:"
+#~ msgstr "Дистрибутив:"
-#~ msgid "security"
-#~ msgstr "security"
+#~ msgid "Package version:"
+#~ msgstr "Версія пакунка:"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "wontfix"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "не показувати статистику в кінці"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "не показувати зміст в заголовку"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "не впорядковувати по стану чи важливості"
-#~ msgid "Include tag:"
-#~ msgstr "Включаючи мітки:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "показувати злиті помилки лише раз"
-#~ msgid "Exclude tag:"
-#~ msgstr "Не включаючи мітки:"
+#~ msgid "active bugs"
+#~ msgstr "активні помилки"
+
+#~ msgid "Flags:"
+#~ msgstr "Прапорці:"
diff --git a/ukrainian/po/consultants.uk.po b/ukrainian/po/consultants.uk.po
index 4c599e6dd95..c00037e3070 100644
--- a/ukrainian/po/consultants.uk.po
+++ b/ukrainian/po/consultants.uk.po
@@ -8,10 +8,11 @@ msgstr ""
"PO-Revision-Date: 2017-11-14 23:48+0200\n"
"Last-Translator: Volodymyr Bodenchuk <Bodenchuk@bigmir.net>\n"
"Language-Team: Ukrainian <ukrainian>\n"
-"Language uk\n"
+"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language uk\n"
"X-Generator: Gtranslator 2.91.7\n"
"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"
diff --git a/ukrainian/po/distrib.uk.po b/ukrainian/po/distrib.uk.po
index 4d74d6a7708..3f27a8e90e4 100644
--- a/ukrainian/po/distrib.uk.po
+++ b/ukrainian/po/distrib.uk.po
@@ -215,38 +215,38 @@ msgstr ""
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "пакунки, що містять файли чи директорії з такою назвою"
-
-#~ msgid "all files in this package"
-#~ msgstr "всі файли в цьому пакунку"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "Case sensitive"
-#~ msgstr "Враховувати регістр"
+#~ msgid "Search case sensitive"
+#~ msgstr "Пошук чутливий до регістру"
-#~ msgid "no"
-#~ msgstr "ні"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Шукати частини слів"
-#~ msgid "yes"
-#~ msgstr "так"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
#~ msgid "AMD64"
#~ msgstr "AMD64"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "yes"
+#~ msgstr "так"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Шукати частини слів"
+#~ msgid "no"
+#~ msgstr "ні"
-#~ msgid "Search case sensitive"
-#~ msgstr "Пошук чутливий до регістру"
+#~ msgid "Case sensitive"
+#~ msgstr "Враховувати регістр"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "all files in this package"
+#~ msgstr "всі файли в цьому пакунку"
+
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "пакунки, що містять файли чи директорії з такою назвою"
diff --git a/ukrainian/po/doc.uk.po b/ukrainian/po/doc.uk.po
index d0f9a7338f9..e95302efe52 100644
--- a/ukrainian/po/doc.uk.po
+++ b/ukrainian/po/doc.uk.po
@@ -30,8 +30,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -55,31 +55,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr "Архітектура Debian 2.2 ARM"
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -91,7 +67,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -103,7 +79,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -111,6 +87,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Автор:"
@@ -163,10 +155,10 @@ msgstr "(версія <get-var version />)"
msgid "plain text"
msgstr "звичайний текст"
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -191,12 +183,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -223,3 +209,6 @@ msgstr "HTML"
#: ../../english/releases/arches.data:36
msgid "PDF"
msgstr "PDF"
+
+#~ msgid "Debian 2.2 ARM architecture"
+#~ msgstr "Архітектура Debian 2.2 ARM"
diff --git a/ukrainian/po/l10n.uk.po b/ukrainian/po/l10n.uk.po
index 6d8dea355c4..611bb9b88eb 100644
--- a/ukrainian/po/l10n.uk.po
+++ b/ukrainian/po/l10n.uk.po
@@ -99,8 +99,8 @@ msgstr "POT-файли"
msgid "Hints for translators"
msgstr "Підказки перекладачам"
-#~ msgid "Translated templates"
-#~ msgstr "Перекладені шаблони"
-
#~ msgid "Original templates"
#~ msgstr "Оригінальні шаблони"
+
+#~ msgid "Translated templates"
+#~ msgstr "Перекладені шаблони"
diff --git a/ukrainian/po/newsevents.uk.po b/ukrainian/po/newsevents.uk.po
index 6207148aee5..c73c40ac435 100644
--- a/ukrainian/po/newsevents.uk.po
+++ b/ukrainian/po/newsevents.uk.po
@@ -21,7 +21,6 @@ msgid "Debian News"
msgstr "Новини Debian"
#: ../../english/News/news.rdf.in:19
-#| msgid "Latest News"
msgid "Debian Latest News"
msgstr "Останні новини Debian"
diff --git a/ukrainian/po/organization.uk.po b/ukrainian/po/organization.uk.po
index eb6e80d1155..6973ed8945e 100644
--- a/ukrainian/po/organization.uk.po
+++ b/ukrainian/po/organization.uk.po
@@ -53,7 +53,6 @@ msgid "SRM"
msgstr "КСВ"
#: ../../english/intro/organization.data:34
-#| msgid "Release Managers"
msgid "Stable Release Manager"
msgstr "Керівник стабільного випуску"
@@ -66,7 +65,6 @@ msgid "chairman"
msgstr "голова"
#: ../../english/intro/organization.data:42
-#| msgid "FTP Assistants"
msgid "assistant"
msgstr "помічник"
@@ -80,23 +78,22 @@ msgid "Officers"
msgstr "Керівники"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Дистрибутив"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr "Зв'язок та інформаційна підтримка"
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
-#| msgid "Publicity"
+#: ../../english/intro/organization.data:232
msgid "Publicity team"
msgstr "Команда зв'язків з громадськістю"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Підтримка та інфраструктура"
@@ -113,188 +110,179 @@ msgstr "Лідер"
msgid "Technical Committee"
msgstr "Технічний комітет"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Секретар"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Проекти розробки"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "FTP-архіви"
-#: ../../english/intro/organization.data:86
-#| msgid "FTP Master"
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "FTP-майстри"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "FTP-помічники"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "FTP-чарівники"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Зворотнє перенесення"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Команда зворотнього перенесення"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Окремі пакунки пакунки"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Керування випуском"
-#: ../../english/intro/organization.data:112
-#| msgid "Release Notes"
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Команда, відповідальна за випуск"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Забезпечення якості"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Команда системи встановлення"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Інформація про випуск"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Образи компакт-дисків"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Виробництво"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Тестування"
-#: ../../english/intro/organization.data:141
-#| msgid "Support and Infrastructure"
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Інфраструктура автоматичного збирання"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Команда підготовки до збирання"
-#: ../../english/intro/organization.data:151
-#| msgid "System Administration"
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Адміністрування збирання"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Документація"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
msgid "Work-Needing and Prospective Packages list"
msgstr "Список пакунків що потребують доробки або плануються"
-#: ../../english/intro/organization.data:178
-#| msgid "Installation System Team"
-msgid "Live System Team"
-msgstr "Команда робочої системи"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Перенесення"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Спеціальні конфігурації"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Лептопи"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Брандмауери"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Вбудовані системи"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Контакт для преси"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Веб-сторінки"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Планета Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Інформаційна підтримка"
-#: ../../english/intro/organization.data:253
-#| msgid "Development Projects"
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Проект Жінки Debian"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Анти-домагання"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Події"
-#: ../../english/intro/organization.data:273
-#| msgid "Technical Committee"
+#: ../../english/intro/organization.data:278
msgid "DebConf Committee"
msgstr "Комітет DebConf"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Партнерська програма"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Координація пожертвування обладнання"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Підтримка користувачів"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Система відслідковування помилок"
-#: ../../english/intro/organization.data:370
-#| msgid "Mailing Lists Administration"
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Керування списками розсилки та архіви списків розсилки"
-#: ../../english/intro/organization.data:378
-#| msgid "New Maintainers Front Desk"
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Реєстраційний стіл нових членів"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Керівники облікових записів Debian (КОЗД)"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -302,31 +290,31 @@ msgstr ""
"Щоб надіслати приватне повідомлення усім КОЗД, використовуйте ключ GPG "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Супроводжуючі зв'язок ключів (PGP та GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Команда безпеки"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Сторінка консультантів"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Сторінка постачальників компакт-дисків"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Політика"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Системне адміністрування"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -335,7 +323,7 @@ msgstr ""
"машинами Debian, включно з проблемами з паролями, або якщо вам потрібно "
"встановити пакунок."
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -345,112 +333,130 @@ msgstr ""
"<a href=\"https://db.debian.org/machines.cgi\">Машини Debian</a>, вона "
"повинна містити інформацію про адміністраторів кожної машини."
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Адміністратор LDAP-каталогу розробників"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Дзеркала"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Супроводжуючий DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Система відслідковування пакунків"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Ревізор"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Запити на використання <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">торгової марки</a>"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Адміністратори Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Адміністратори Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian для дітей від 1 до 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian для медичної практики та досліджень"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian для освіти"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian в адвокатурах"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian для людей з обмеженими можливостями"
-#: ../../english/intro/organization.data:481
-#| msgid "Debian for medical practice and research"
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian для науки та суміжних досліджень"
-#~ msgid "Publicity"
-#~ msgstr "Зв'язки з громадскістю"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian для освіти"
-#~ msgid "Release Assistants"
-#~ msgstr "Помічники керівника випуском"
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Команда безпеки"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Керівник випуском „stable“"
+#~ msgid "Security Audit Project"
+#~ msgstr "Проект перевірки безпеки"
-#~ msgid "Vendors"
-#~ msgstr "Постачальники"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Це ще не є офіційний внутрішній проект Debian, але оголошення про "
+#~ "прагнення інтеграції."
-#~ msgid "APT Team"
-#~ msgstr "Команда APT"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Мультимедійний дистрибутив Debian"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Архіви списків розсилки"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian для підприємств"
-#~ msgid "Security Testing Team"
-#~ msgstr "Команда безпеки тестового дистрибутиву"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian для некомерційних організацій"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Координація підписування ключів"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Універсальна операційна система як робочій стіл"
#~ msgid "Accountant"
#~ msgstr "Рахівник"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Універсальна операційна система як робочій стіл"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Координація підписування ключів"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian для некомерційних організацій"
+#~ msgid "Security Testing Team"
+#~ msgstr "Команда безпеки тестового дистрибутиву"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian для підприємств"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Архіви списків розсилки"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Мультимедійний дистрибутив Debian"
+#~ msgid "APT Team"
+#~ msgstr "Команда APT"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Це ще не є офіційний внутрішній проект Debian, але оголошення про "
-#~ "прагнення інтеграції."
+#~ msgid "Vendors"
+#~ msgstr "Постачальники"
-#~ msgid "Security Audit Project"
-#~ msgstr "Проект перевірки безпеки"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Керівник випуском „stable“"
-#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "Команда безпеки"
+#~ msgid "Release Assistants"
+#~ msgstr "Помічники керівника випуском"
+
+#~ msgid "Publicity"
+#~ msgstr "Зв'язки з громадскістю"
+
+#~ msgid "Auditor"
+#~ msgstr "Ревізор"
+
+#~| msgid "Installation System Team"
+#~ msgid "Live System Team"
+#~ msgstr "Команда робочої системи"
diff --git a/ukrainian/po/others.uk.po b/ukrainian/po/others.uk.po
index b775a43cfb5..f4bebbad383 100644
--- a/ukrainian/po/others.uk.po
+++ b/ukrainian/po/others.uk.po
@@ -125,17 +125,14 @@ msgstr ""
"\">https://www.debian.org/intl/spanish/</a> (доступно лише іспанською)."
#: ../../english/distrib/pre-installed.defs:18
-#| msgid "Phone:"
msgid "Phone"
msgstr "Телефон"
#: ../../english/distrib/pre-installed.defs:19
-#| msgid "Fax:"
msgid "Fax"
msgstr "Факс"
#: ../../english/distrib/pre-installed.defs:21
-#| msgid "Address:"
msgid "Address"
msgstr "Адреса"
@@ -228,7 +225,6 @@ msgid "umbrellas"
msgstr "парасолі"
#: ../../english/misc/merchandise.def:51
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "наволочки"
diff --git a/ukrainian/po/partners.uk.po b/ukrainian/po/partners.uk.po
index 0190c8de9ea..3c5e0a91b08 100644
--- a/ukrainian/po/partners.uk.po
+++ b/ukrainian/po/partners.uk.po
@@ -3,48 +3,68 @@
#
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-11-15 00:06+0200\n"
"Last-Translator: Volodymyr Bodenchuk <Bodenchuk@bigmir.net>\n"
"Language-Team: Ukrainian <ukrainian>\n"
"Language: uk\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"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"
-"PO-Revision-Date: 2017-11-15 00:06+0200\n"
"X-Generator: Gtranslator 2.91.7\n"
#: ../../english/partners/partners.def:8
+msgid "Partner of the Month"
+msgstr ""
+
+#: ../../english/partners/partners.def:12
+msgid "Alphabetical List of Partners"
+msgstr ""
+
+#: ../../english/partners/partners.def:16
msgid "Development Partners"
msgstr "Партнери по розробці"
-#: ../../english/partners/partners.def:12
+#: ../../english/partners/partners.def:20
msgid "Financial Partners"
msgstr "Фінансові партнери"
-#: ../../english/partners/partners.def:16
+#: ../../english/partners/partners.def:24
msgid "Service Partners"
msgstr "Обслуговуючі партнери"
-#: ../../english/partners/partners.def:20
+#: ../../english/partners/partners.def:30
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."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:23
+#: ../../english/partners/partners.def:33
msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:41
+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 ""
+
+#: ../../english/partners/partners.def:45
+msgid ""
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
+msgstr ""
+
+#: ../../english/partners/partners.def:53
msgid ""
"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
"supporting the Debian project as a hosting partner for several years. In "
@@ -53,7 +73,7 @@ msgid ""
"at conova."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:56
msgid ""
"conova operates one of the most modern data centers in all of Europe in "
"Salzburg, Austria. Their services: customized solutions for housing, "
@@ -62,115 +82,86 @@ msgid ""
"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:34
-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:37
-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:41
-msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
-msgstr ""
-
-#: ../../english/partners/partners.def:44
-msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
-msgstr ""
-
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -179,45 +170,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -226,7 +213,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -234,187 +221,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/ukrainian/po/ports.uk.po b/ukrainian/po/ports.uk.po
index e732b5ca673..ff93b7edfb3 100644
--- a/ukrainian/po/ports.uk.po
+++ b/ukrainian/po/ports.uk.po
@@ -121,32 +121,32 @@ msgstr "Debian для PowerPC"
msgid "Debian for Sparc"
msgstr "Debian для Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian для лептопів"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian для AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian для Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian для ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian для S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian для Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian для MIPS"
-#~ msgid "Main"
-#~ msgstr "Головна сторінка"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian для Motorola 680x0"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian для Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Головна сторінка"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian для MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian для Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian для S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian для ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian для Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian для AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian для лептопів"
diff --git a/ukrainian/po/stats.uk.po b/ukrainian/po/stats.uk.po
index ac953675b95..b005e7fa8a1 100644
--- a/ukrainian/po/stats.uk.po
+++ b/ukrainian/po/stats.uk.po
@@ -31,79 +31,90 @@ msgstr "Всього %d байт для перекладу."
msgid "There are %d strings to translate."
msgstr "Всього %d рядків для перекладу."
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Цей переклад надто застарілий"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
msgid "Wrong translation version"
msgstr "Невірна версія перекладу"
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Цей переклад надто застарілий"
+
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr "Оригінал новіший за цей переклад"
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr "Оригінал більше не існує"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr "кількість звернень не відома"
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr "звернень"
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr "Натисніть, щоб отримати дані diffstat"
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr "Уніфікований diff"
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr "Кольоровий diff"
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+#, fuzzy
+#| msgid "Colored diff"
+msgid "Commit diff"
+msgstr "Кольоровий diff"
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr "Створено за допомогою <transstatslink>"
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr "Підсумок перекладу для"
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr "Не перекладені"
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr "Застарілі"
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr "Перекладені"
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr "Актуальні"
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr "файлів"
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr "байт"
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
@@ -111,130 +122,130 @@ msgstr ""
"Примітка: цей список сторінок відсортований за популярністю. Наведіть мишку "
"на назву сторінки, щоб побачити кількість звернень."
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr "Застарілі переклади"
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr "Файли"
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr "Коментар"
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr "Журнал"
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr "Переклад"
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr "Супроводжувач"
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr "Статус"
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr "Перекладач"
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr "Дата"
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr "Не перекладені сторінки загального характеру"
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr "Не перекладені сторінки загального характеру"
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr "Не перекладені сторінки новин"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr "Не перекладені сторінки новин"
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr "Не перекладені сторінки про консультантів/користувачів"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr "Не перекладені сторінки про консультантів/користувачів"
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr "Не перекладені міжнародні сторінки"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr "Не перекладені міжнародні сторінки"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr "Перекладені сторінки (актуальні)"
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr "Перекладені шаблони (файли PO)"
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr "Статистика перекладу файлів PO"
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr "Не точні"
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr "Не перекладені"
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr "Всього"
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr "Всього:"
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr "Перекладені веб-сторінки"
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr "Статистика перекладу за кількістю сторінок"
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr "Мова"
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr "Переклади"
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr "Перекладені веб-сторінки (за розміром)"
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr "Статистика перекладу за розміром сторінок"
diff --git a/ukrainian/po/templates.uk.po b/ukrainian/po/templates.uk.po
index 01637311ca2..07e304fcabb 100644
--- a/ukrainian/po/templates.uk.po
+++ b/ukrainian/po/templates.uk.po
@@ -17,7 +17,6 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../../english/search.xml.in:7
-#| msgid "Debian Project"
msgid "Debian website"
msgstr "Веб-сайт Debian"
@@ -27,7 +26,6 @@ msgstr "Пошук веб-сайту Debian."
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Debian"
@@ -48,10 +46,6 @@ msgid "Debian Project"
msgstr "Проект Debian"
#: ../../english/template/debian/common_translation.wml:13
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -160,7 +154,6 @@ msgid "Getting Debian"
msgstr "Отримання Debian"
#: ../../english/template/debian/common_translation.wml:85
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Блог Debian"
@@ -211,17 +204,19 @@ msgstr "у випуску 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../english/template/debian/footer.wml:105
+#, 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>."
+#| "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, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Щоб повідомити про проблему із веб-сайтом, надішліть лист на нашу публічну "
"адресу <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -247,8 +242,6 @@ msgstr ""
"Дивіться <a href=\"m4_HOME/license\" rel=\"copyright\">умови ліцензії</a>"
#: ../../english/template/debian/footer.wml:120
-#| 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."
@@ -284,12 +277,10 @@ msgid "Weekly News"
msgstr "Щотижневі новини"
#: ../../english/template/debian/links.tags.wml:16
-#| msgid "Debian Project"
msgid "Debian Project News"
msgstr "Новини роекту Debian"
#: ../../english/template/debian/links.tags.wml:19
-#| msgid "Weekly News"
msgid "Project News"
msgstr "Новини проекту"
@@ -314,7 +305,6 @@ msgid "Debian Books"
msgstr "Книги Debian"
#: ../../english/template/debian/links.tags.wml:37
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Debian Вікі"
@@ -347,7 +337,6 @@ msgid "Developer Database"
msgstr "База даних розробників"
#: ../../english/template/debian/links.tags.wml:64
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "ЧаПи Debian"
@@ -456,7 +445,6 @@ msgid "Debian Developer's Packages Overview"
msgstr "Огляд пакунків для розробників Debian"
#: ../../english/template/debian/navbar.wml:10
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Домівка Debian"
@@ -528,6 +516,10 @@ msgid ""
msgstr ""
"<em>Зауваження:</em> Оригінальний документ цього перекладу більше не існує."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
@@ -536,428 +528,428 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Повернутися на <a href=\"./\">сторінку користувачів Debian</a>."
-#~ msgid "More information"
-#~ msgstr "Додаткова інформація"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Майбутні події"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Відвідайте нашого спонсора"
-#~ msgid "link may no longer be valid"
-#~ msgstr "посилання може бути більше не діяти"
+#~ msgid "Select a server near you"
+#~ msgstr "Виберіть найближчий сервер"
-#~ msgid "When"
-#~ msgstr "Коли"
+#~ msgid "More information:"
+#~ msgstr "Додаткова інформація:"
-#~ msgid "Where"
-#~ msgstr "Де"
+#~ msgid "Taken by:"
+#~ msgstr "Відповідальний:"
-#~ msgid "More Info"
-#~ msgstr "Додаткова інформація"
+#~ msgid "Nobody"
+#~ msgstr "Ніхто"
-#~ msgid "Debian Involvement"
-#~ msgstr "Участь Debian"
+#~ msgid "Rating:"
+#~ msgstr "Рейтинг:"
-#~ msgid "Main Coordinator"
-#~ msgstr "Головний координатор"
+#~ msgid "List of Consultants"
+#~ msgstr "Список консультантів"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Координатор</th><th>проекту</th>"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
-#~ msgid "Related Links"
-#~ msgstr "Пов'язані посилання"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Latest News"
-#~ msgstr "Останні новини"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Завантажити за допомогою Jigdo"
-#~ msgid "Download calendar entry"
-#~ msgstr "Завантажити календарний запис"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Завантажити через HTTP/FTP"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Повернутися до: інших <a href=\"./\">новин Debian</a> || <a href="
-#~ "\"m4_HOME/\">головну сторінку проекту Debian</a>."
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Купити CD або DVD"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (мертве посилання)"
+#~ msgid "Network Install"
+#~ msgstr "Встановлення через мережу"
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Завантажити"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "Також наявні <a href=\"../../\">минулі випуски</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Різне"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Відображення"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-дзеркала"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Завантажити через Torrent"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Команда CD Debian"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Переклав %s."
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian на CD"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Переклали %s."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />FAQ"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Переклала %s."
+#~ msgid "jigdo"
+#~ msgstr "jidgo"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Переклали %s."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "List of Speakers"
-#~ msgstr "Список доповідачів"
+#~ msgid "buy"
+#~ msgstr "купити"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
+#~ msgid "net_install"
+#~ msgstr "встановлення через мережу"
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />різне"
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "Англомовний <a href=\"/MailingLists/disclaimer\">список розсилки</a> "
+#~ "присвячений CD/DVD:"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Date"
+#~ msgstr "Дата"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Platforms"
+#~ msgstr "Платформи"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Text"
+#~ msgstr "Текст"
-#~ msgid "No requests for adoption"
-#~ msgstr "Запитів про „усиновлення“ не поступали"
+#~ msgid "Ballot"
+#~ msgstr "Бюлетень"
-#~ msgid "No orphaned packages"
-#~ msgstr "Немає „осиротілих“ пакунків"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Очікує&nbsp;спонсорів"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Немає пакунків, що очікують на „усиновлення“"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Розглядається"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Немає пакунків, по яким ведеться робота"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Голосування&nbsp;відкрите"
-#~ msgid "No Requested packages"
-#~ msgstr "Немає запитів на створення пакунків"
+#~ msgid "Decided"
+#~ msgstr "Прийняте"
-#~ msgid "No help requested"
-#~ msgstr "Немає запитів про допомогу"
+#~ msgid "Withdrawn"
+#~ msgstr "Відхилене"
-#~ msgid "in adoption since today."
-#~ msgstr "„усиновлення“ почалося сьогодні."
+#~ msgid "Other"
+#~ msgstr "Інше"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "„усиновлення“ почалося вчора."
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "На&nbsp;сторінку&nbsp;голосувань"
-#~ msgid "%s days in adoption."
-#~ msgstr "„усиновлення“ почалося %s днів тому."
+#~ msgid "How&nbsp;To"
+#~ msgstr "Як"
-#~ msgid "in preparation since today."
-#~ msgstr "робота почалась сьогодні."
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Внести&nbsp;пропозицію"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "робота почалась вчора."
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Внести&nbsp;поправку"
-#~ msgid "%s days in preparation."
-#~ msgstr "робота почалась %s днів тому."
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Підтримати&nbsp;пропозицію"
-#~ msgid "requested today."
-#~ msgstr "запит отриманий сьогодні."
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Взнати&nbsp;результат"
-#~ msgid "requested yesterday."
-#~ msgstr "запит отриманий вчора."
+#~ msgid "Vote"
+#~ msgstr "Проголосувати"
-#~ msgid "requested %s days ago."
-#~ msgstr "запит отриманий %s днів тому."
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Дивіться сторінку <a href=\"./\">інформації про ліцензії</a> для огляду "
+#~ "резюме Debian по ліцензіям (Debian License Summaries&nbsp;&mdash; DLS)."
-#~ msgid "package info"
-#~ msgstr "інформація про пакунок"
+#~ msgid "Not Redistributable"
+#~ msgstr "З обмеженнями на розповсюдження"
-#~ msgid "License Information"
-#~ msgstr "Інформація про ліцензії"
+#~ msgid "Non-Free"
+#~ msgstr "Невільні"
-#~ msgid "DLS Index"
-#~ msgstr "Індекс DLS"
+#~ msgid "Free"
+#~ msgstr "Вільні"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "not redistributable"
+#~ msgstr "з обмеженнями на розповсюдження"
-#~ msgid "DFSG FAQ"
-#~ msgstr "FAQ по DFSG"
+#~ msgid "non-free"
+#~ msgstr "невільна"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Архів Debian-Legal"
+#~ msgid "free"
+#~ msgstr "вільна"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s&nbsp;&mdash; %s: %s"
+#~ msgid "License text"
+#~ msgstr "Текст ліцензії"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s&nbsp;&mdash; %s, версія %s: %s"
+#~ msgid "License text (translated)"
+#~ msgstr "Текст ліцензії (перекладений)"
-#~ msgid "Date published"
-#~ msgstr "Дата публікації"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Підготував це резюме <summary-author/>."
-#~ msgid "License"
-#~ msgstr "Ліцензія"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Автор початкового резюме: <summary-author/>. Резюме може бути знайдене в "
+#~ "<a href=\"<summary-url/>\">списку розсилки</a>."
-#~ msgid "Version"
-#~ msgstr "Версія"
+#~ msgid "Original Summary"
+#~ msgstr "Початкове резюме"
-#~ msgid "Summary"
-#~ msgstr "Резюме"
+#~ msgid "Discussion"
+#~ msgstr "Обговорення"
#~ msgid "Justification"
#~ msgstr "Обґрунтування"
-#~ msgid "Discussion"
-#~ msgstr "Обговорення"
+#~ msgid "Summary"
+#~ msgstr "Резюме"
-#~ msgid "Original Summary"
-#~ msgstr "Початкове резюме"
+#~ msgid "Version"
+#~ msgstr "Версія"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Автор початкового резюме: <summary-author/>. Резюме може бути знайдене в "
-#~ "<a href=\"<summary-url/>\">списку розсилки</a>."
+#~ msgid "License"
+#~ msgstr "Ліцензія"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Підготував це резюме <summary-author/>."
+#~ msgid "Date published"
+#~ msgstr "Дата публікації"
-#~ msgid "License text (translated)"
-#~ msgstr "Текст ліцензії (перекладений)"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s&nbsp;&mdash; %s, версія %s: %s"
-#~ msgid "License text"
-#~ msgstr "Текст ліцензії"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s&nbsp;&mdash; %s: %s"
-#~ msgid "free"
-#~ msgstr "вільна"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Архів Debian-Legal"
-#~ msgid "non-free"
-#~ msgstr "невільна"
+#~ msgid "DFSG FAQ"
+#~ msgstr "FAQ по DFSG"
-#~ msgid "not redistributable"
-#~ msgstr "з обмеженнями на розповсюдження"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Free"
-#~ msgstr "Вільні"
+#~ msgid "DLS Index"
+#~ msgstr "Індекс DLS"
-#~ msgid "Non-Free"
-#~ msgstr "Невільні"
+#~ msgid "License Information"
+#~ msgstr "Інформація про ліцензії"
-#~ msgid "Not Redistributable"
-#~ msgstr "З обмеженнями на розповсюдження"
+#~ msgid "package info"
+#~ msgstr "інформація про пакунок"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Дивіться сторінку <a href=\"./\">інформації про ліцензії</a> для огляду "
-#~ "резюме Debian по ліцензіям (Debian License Summaries&nbsp;&mdash; DLS)."
+#~ msgid "requested %s days ago."
+#~ msgstr "запит отриманий %s днів тому."
-#~ msgid "Vote"
-#~ msgstr "Проголосувати"
+#~ msgid "requested yesterday."
+#~ msgstr "запит отриманий вчора."
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Взнати&nbsp;результат"
+#~ msgid "requested today."
+#~ msgstr "запит отриманий сьогодні."
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Підтримати&nbsp;пропозицію"
+#~ msgid "%s days in preparation."
+#~ msgstr "робота почалась %s днів тому."
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Внести&nbsp;поправку"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "робота почалась вчора."
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Внести&nbsp;пропозицію"
+#~ msgid "in preparation since today."
+#~ msgstr "робота почалась сьогодні."
-#~ msgid "How&nbsp;To"
-#~ msgstr "Як"
+#~ msgid "%s days in adoption."
+#~ msgstr "„усиновлення“ почалося %s днів тому."
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "На&nbsp;сторінку&nbsp;голосувань"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "„усиновлення“ почалося вчора."
-#~ msgid "Other"
-#~ msgstr "Інше"
+#~ msgid "in adoption since today."
+#~ msgstr "„усиновлення“ почалося сьогодні."
-#~ msgid "Withdrawn"
-#~ msgstr "Відхилене"
+#~ msgid "No help requested"
+#~ msgstr "Немає запитів про допомогу"
-#~ msgid "Decided"
-#~ msgstr "Прийняте"
+#~ msgid "No Requested packages"
+#~ msgstr "Немає запитів на створення пакунків"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Голосування&nbsp;відкрите"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Немає пакунків, по яким ведеться робота"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Розглядається"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Немає пакунків, що очікують на „усиновлення“"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Очікує&nbsp;спонсорів"
+#~ msgid "No orphaned packages"
+#~ msgstr "Немає „осиротілих“ пакунків"
-#~ msgid "Ballot"
-#~ msgstr "Бюлетень"
+#~ msgid "No requests for adoption"
+#~ msgstr "Запитів про „усиновлення“ не поступали"
-#~ msgid "Text"
-#~ msgstr "Текст"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Platforms"
-#~ msgstr "Платформи"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Date"
-#~ msgstr "Дата"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "Англомовний <a href=\"/MailingLists/disclaimer\">список розсилки</a> "
-#~ "присвячений CD/DVD:"
+#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />різне"
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
-#~ msgid "net_install"
-#~ msgstr "встановлення через мережу"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
-#~ msgid "buy"
-#~ msgstr "купити"
+#~ msgid "List of Speakers"
+#~ msgstr "Список доповідачів"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Переклали %s."
-#~ msgid "jigdo"
-#~ msgstr "jidgo"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Переклала %s."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />FAQ"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Переклали %s."
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian на CD"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Переклав %s."
-#~ msgid "Debian CD team"
-#~ msgstr "Команда CD Debian"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Завантажити через Torrent"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-дзеркала"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Відображення"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Різне"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "Також наявні <a href=\"../../\">минулі випуски</a>."
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Завантажити"
+#, fuzzy
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
-#~ msgid "Network Install"
-#~ msgstr "Встановлення через мережу"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (мертве посилання)"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Купити CD або DVD"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Повернутися до: інших <a href=\"./\">новин Debian</a> || <a href="
+#~ "\"m4_HOME/\">головну сторінку проекту Debian</a>."
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Завантажити через HTTP/FTP"
+#~ msgid "Download calendar entry"
+#~ msgstr "Завантажити календарний запис"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Завантажити за допомогою Jigdo"
+#~ msgid "Latest News"
+#~ msgstr "Останні новини"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Related Links"
+#~ msgstr "Пов'язані посилання"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Координатор</th><th>проекту</th>"
-#~ msgid "List of Consultants"
-#~ msgstr "Список консультантів"
+#~ msgid "Main Coordinator"
+#~ msgstr "Головний координатор"
-#~ msgid "Rating:"
-#~ msgstr "Рейтинг:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Участь Debian"
-#~ msgid "Nobody"
-#~ msgstr "Ніхто"
+#~ msgid "More Info"
+#~ msgstr "Додаткова інформація"
-#~ msgid "Taken by:"
-#~ msgstr "Відповідальний:"
+#~ msgid "Where"
+#~ msgstr "Де"
-#~ msgid "More information:"
-#~ msgstr "Додаткова інформація:"
+#~ msgid "When"
+#~ msgstr "Коли"
-#~ msgid "Select a server near you"
-#~ msgstr "Виберіть найближчий сервер"
+#~ msgid "link may no longer be valid"
+#~ msgstr "посилання може бути більше не діяти"
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Відвідайте нашого спонсора"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Майбутні події"
+
+#~ msgid "More information"
+#~ msgstr "Додаткова інформація"
diff --git a/ukrainian/po/vendors.uk.po b/ukrainian/po/vendors.uk.po
index d6a0b2d1e19..82d4604ddcb 100644
--- a/ukrainian/po/vendors.uk.po
+++ b/ukrainian/po/vendors.uk.po
@@ -17,12 +17,10 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../../english/CD/vendors/vendors.CD.def:14
-#| msgid "Vendor:"
msgid "Vendor"
msgstr "Постачальник"
#: ../../english/CD/vendors/vendors.CD.def:15
-#| msgid "Allows Contribution to Debian:"
msgid "Allows Contributions"
msgstr "Дозволяє внески"
@@ -31,12 +29,10 @@ msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
#: ../../english/CD/vendors/vendors.CD.def:17
-#| msgid "Architectures:"
msgid "Architectures"
msgstr "Архітектури"
#: ../../english/CD/vendors/vendors.CD.def:18
-#| msgid "Ship International:"
msgid "Ship International"
msgstr "Міжнародна доставка"
@@ -47,7 +43,6 @@ msgstr "Контакт"
#. ###################
#. Vendor home page link, Debian page link
#: ../../english/CD/vendors/vendors.CD.def:44
-#| msgid "Vendor:"
msgid "Vendor Home"
msgstr "Сторінка постачальника"
@@ -56,7 +51,6 @@ msgid "page"
msgstr "сторінка"
#: ../../english/CD/vendors/vendors.CD.def:71
-#| msgid "email:"
msgid "email"
msgstr "електронна пошта"
@@ -76,74 +70,74 @@ msgstr "джерельні коди"
msgid "and"
msgstr "та"
-#~ msgid "Official CD"
-#~ msgstr "Офіційні CD"
-
-#~ msgid "Official DVD"
-#~ msgstr "Офіційні DVD"
+#~ msgid "Vendor:"
+#~ msgstr "Постачальник:"
-#~ msgid "Development Snapshot"
-#~ msgstr "Знімок для розробиків"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL для сторінки Debian:"
-#~ msgid "Vendor Release"
-#~ msgstr "Випуск продавця"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Дозволяє внесок для Debian"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Декілька дистрибутивів"
+#~ msgid "Country:"
+#~ msgstr "Країна:"
-#~ msgid "non-US included"
-#~ msgstr "з non-US"
+#~ msgid "Ship International:"
+#~ msgstr "Міжнародна доставка:"
-#~ msgid "non-free included"
-#~ msgstr "з non-free"
+#~ msgid "email:"
+#~ msgstr "E-mail:"
-#~ msgid "contrib included"
-#~ msgstr "з contrib"
+#~ msgid "CD Type:"
+#~ msgstr "Тип CD:"
-#~ msgid "vendor additions"
-#~ msgstr "додатки продавця"
+#~ msgid "DVD Type:"
+#~ msgstr "Тип DVD:"
-#~ msgid "Custom Release"
-#~ msgstr "Власний випуск"
+#~ msgid "Architectures:"
+#~ msgstr "Архітектури:"
-#~ msgid "reseller of $var"
-#~ msgstr "реселлер $var"
+#~ msgid "updated monthly"
+#~ msgstr "оновлення раз на місяць"
-#~ msgid "reseller"
-#~ msgstr "реселлер"
+#~ msgid "updated twice weekly"
+#~ msgstr "оновлення два рази на тиждень"
#~ msgid "updated weekly"
#~ msgstr "щотижневі оновлення"
-#~ msgid "updated twice weekly"
-#~ msgstr "оновлення два рази на тиждень"
+#~ msgid "reseller"
+#~ msgstr "реселлер"
-#~ msgid "updated monthly"
-#~ msgstr "оновлення раз на місяць"
+#~ msgid "reseller of $var"
+#~ msgstr "реселлер $var"
-#~ msgid "Architectures:"
-#~ msgstr "Архітектури:"
+#~ msgid "Custom Release"
+#~ msgstr "Власний випуск"
-#~ msgid "DVD Type:"
-#~ msgstr "Тип DVD:"
+#~ msgid "vendor additions"
+#~ msgstr "додатки продавця"
-#~ msgid "CD Type:"
-#~ msgstr "Тип CD:"
+#~ msgid "contrib included"
+#~ msgstr "з contrib"
-#~ msgid "email:"
-#~ msgstr "E-mail:"
+#~ msgid "non-free included"
+#~ msgstr "з non-free"
-#~ msgid "Ship International:"
-#~ msgstr "Міжнародна доставка:"
+#~ msgid "non-US included"
+#~ msgstr "з non-US"
-#~ msgid "Country:"
-#~ msgstr "Країна:"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Декілька дистрибутивів"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Дозволяє внесок для Debian"
+#~ msgid "Vendor Release"
+#~ msgstr "Випуск продавця"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL для сторінки Debian:"
+#~ msgid "Development Snapshot"
+#~ msgstr "Знімок для розробиків"
-#~ msgid "Vendor:"
-#~ msgstr "Постачальник:"
+#~ msgid "Official DVD"
+#~ msgstr "Офіційні DVD"
+
+#~ msgid "Official CD"
+#~ msgstr "Офіційні CD"
diff --git a/ukrainian/po/wnpp.uk.po b/ukrainian/po/wnpp.uk.po
index c7ff7ac9b49..979508ac1a7 100644
--- a/ukrainian/po/wnpp.uk.po
+++ b/ukrainian/po/wnpp.uk.po
@@ -55,12 +55,10 @@ msgid "%s days in adoption."
msgstr "„усиновлення“ почалося %s днів тому."
#: ../../english/template/debian/wnpp.wml:46
-#| msgid "%s days in adoption."
msgid "%s days in adoption, last activity today."
msgstr "„усиновлення“ почалося %s днів тому, остання активність була сьогодні."
#: ../../english/template/debian/wnpp.wml:50
-#| msgid "in adoption since yesterday."
msgid "%s days in adoption, last activity yesterday."
msgstr "„усиновлення“ почалося %s днів тому, остання активність була вчора."
@@ -83,50 +81,41 @@ msgid "%s days in preparation."
msgstr "підготовка почалась %s днів тому."
#: ../../english/template/debian/wnpp.wml:72
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity today."
msgstr "підготовка почалась %s днів тому, остання активність була сьогодні."
#: ../../english/template/debian/wnpp.wml:76
-#| msgid "in preparation since yesterday."
msgid "%s days in preparation, last activity yesterday."
msgstr "підготовка почалась %s днів тому, остання активність була вчора."
#: ../../english/template/debian/wnpp.wml:80
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity %s days ago."
msgstr ""
"підготовка почалась %s днів тому, остання активність була %s днів тому."
#. timespans for request for adoption (RFAs)
#: ../../english/template/debian/wnpp.wml:85
-#| msgid "in adoption since today."
msgid "adoption requested since today."
msgstr "запит на „усиновлення“ створений сьогодні."
#: ../../english/template/debian/wnpp.wml:89
-#| msgid "in adoption since yesterday."
msgid "adoption requested since yesterday."
msgstr "запит на „усиновлення“ створений вчора."
#: ../../english/template/debian/wnpp.wml:93
-#| msgid "in adoption since today."
msgid "adoption requested since %s days."
msgstr "запит на „усиновлення“ створений %s днів тому."
#. timespans for orphaned packages (Os)
#: ../../english/template/debian/wnpp.wml:98
-#| msgid "in adoption since today."
msgid "orphaned since today."
msgstr "„осиротів“ сьогодні."
#: ../../english/template/debian/wnpp.wml:102
-#| msgid "in adoption since yesterday."
msgid "orphaned since yesterday."
msgstr "„осиротів“ вчора."
#: ../../english/template/debian/wnpp.wml:106
-#| msgid "in preparation since today."
msgid "orphaned since %s days."
msgstr "„осиротів“ %s днів тому."
diff --git a/vietnamese/po/blends.vi.po b/vietnamese/po/blends.vi.po
index 64b8c15bf29..b00934651af 100644
--- a/vietnamese/po/blends.vi.po
+++ b/vietnamese/po/blends.vi.po
@@ -17,35 +17,43 @@ msgstr ""
#: ../../english/blends/released.data:15
msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
"The goal of DebiChem is to make Debian a good platform for chemists in their "
"day-to-day work."
msgstr ""
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
msgstr ""
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
msgid ""
"The goal of Debian Edu is to provide a Debian OS system suitable for "
"educational use and in schools."
msgstr ""
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
msgid ""
"The goal of Debian GIS is to develop Debian into the best distribution for "
"Geographical Information System applications and users."
msgstr ""
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
msgid ""
"The goal of Debian Junior is to make Debian an OS that children will enjoy "
"using."
msgstr ""
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
msgid ""
"The goal of Debian Med is a complete free and open system for all tasks in "
"medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
"clinic IT infrastructure, and others within the Debian OS."
msgstr ""
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
msgid ""
"The goal of Debian Multimedia is to make Debian a good platform for audio "
"and multimedia work."
msgstr ""
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
msgid ""
"The goal of Debian Science is to provide a better experience when using "
"Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
#: ../../english/blends/unreleased.data:23
msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
"The goal of Debian Design is to provide applications for designers. This "
"includes graphic design, web design and multimedia design."
msgstr ""
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
msgid ""
"The goal of Debian EzGo is to provide culture-based open and free technology "
"with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
"like Africa, Afghanistan, Indonesia, Vietnam using Debian."
msgstr ""
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
msgid ""
"The goal of FreedomBox is to develop, design and promote personal servers "
"running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
"the users."
msgstr ""
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
msgid ""
"The goal of Debian Hamradio is to support the needs of radio amateurs in "
"Debian by providing logging, data mode and packet mode applications and more."
msgstr ""
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
msgid ""
"The goal of DebianParl is to provide applications to support the needs of "
"parliamentarians, politicians and their staffers all around the world."
diff --git a/vietnamese/po/doc.vi.po b/vietnamese/po/doc.vi.po
index 81a86582423..5e142d301f5 100644
--- a/vietnamese/po/doc.vi.po
+++ b/vietnamese/po/doc.vi.po
@@ -20,8 +20,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -45,31 +45,7 @@ msgid ""
" in the home, office, club, or school)."
msgstr ""
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-msgid ""
-"This book is for developers working with GNU/Linux on ARM processors.\n"
-" It covers some devices specifically for quick set-up (LART, Assabet, "
-"Psion5).\n"
-" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are "
-"bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
-"also\n"
-" includes extensive tutorial information on GNU/Linux basics for "
-"developers\n"
-" coming from other platforms.\n"
-" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
-"you\n"
-" will be working from this distribution and preferably have a Debian based\n"
-" host machine too."
-msgstr ""
-
-#: ../../english/doc/books.data:123
+#: ../../english/doc/books.data:101
msgid ""
"The first French book about Debian is already in its fifth edition. It\n"
" covers all aspects of the administration of Debian from the installation\n"
@@ -81,7 +57,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -93,7 +69,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
msgid ""
"This book teaches you how to install and configure the system and also how "
"to use Debian in a professional environment. It shows the full potential of "
@@ -101,6 +77,22 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
@@ -153,10 +145,10 @@ msgstr ""
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
msgstr ""
#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -181,12 +173,6 @@ msgid ""
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
#: ../../english/doc/manuals.defs:188
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
diff --git a/vietnamese/po/mailinglists.vi.po b/vietnamese/po/mailinglists.vi.po
index 324c30101f0..2e88cfd5c47 100644
--- a/vietnamese/po/mailinglists.vi.po
+++ b/vietnamese/po/mailinglists.vi.po
@@ -132,8 +132,8 @@ msgstr "mở"
msgid "closed"
msgstr "đã đóng"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Vui lòng chọn bó nào mà bạn muốn đặt xem dài hạn:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Vui lòng chỉ định bó thư nào bạn muốn đặt xem dài hạn:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Vui lòng chọn bó nào mà bạn muốn đặt xem dài hạn:"
diff --git a/vietnamese/po/organization.vi.po b/vietnamese/po/organization.vi.po
index 26650b3df62..91f9a68aaa2 100644
--- a/vietnamese/po/organization.vi.po
+++ b/vietnamese/po/organization.vi.po
@@ -76,24 +76,24 @@ msgid "Officers"
msgstr "Các nhân viên"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
msgid "Distribution"
msgstr "Phân phối"
#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
#, fuzzy
#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publicity"
#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
msgid "Support and Infrastructure"
msgstr "Hỗ trợ và Cơ sở hạ tầng"
@@ -110,211 +110,211 @@ msgstr "Lãnh đạo"
msgid "Technical Committee"
msgstr "Ủy ban kỹ thuật"
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
msgid "Secretary"
msgstr "Thư ký"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
msgid "Development Projects"
msgstr "Các dự án phát triển"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
msgid "FTP Archives"
msgstr "Lưu trữ FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
msgid "FTP Masters"
msgstr "Chủ FPT"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
msgid "FTP Assistants"
msgstr "Trợ lý FTP"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
msgid "FTP Wizards"
msgstr "Thuật sỹ FTP"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
msgid "Backports"
msgstr "Chuyển ngược"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
msgid "Backports Team"
msgstr "Nhóm chuyển ngược"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
msgid "Individual Packages"
msgstr "Các gói riêng lẻ"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
msgid "Release Management"
msgstr "Ban quản lý phát hành"
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
msgid "Release Team"
msgstr "Nhóm phát hành"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
msgid "Quality Assurance"
msgstr "Đảm bảo chất lượng"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
msgid "Installation System Team"
msgstr "Nhóm Hệ thống cài đặt"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
msgid "Release Notes"
msgstr "Ghi chú phát hành"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
msgid "CD Images"
msgstr "Ảnh CD"
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
msgid "Production"
msgstr "Sản xuất"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
msgid "Testing"
msgstr "Thử nghiệm"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
msgid "Autobuilding infrastructure"
msgstr "Cơ sở hạ tầng tự động biên dịch"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
msgid "Wanna-build team"
msgstr "Nhóm Wanna-build"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
msgid "Buildd administration"
msgstr "Quản tri Buildd"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
msgid "Documentation"
msgstr "Tài liệu"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
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:178
-msgid "Live System Team"
-msgstr "Nhóm hệ thống Live"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
msgid "Ports"
msgstr "Bản chuyển đổi"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
msgid "Special Configurations"
msgstr "Các cấu hình đặc biệt"
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
msgid "Laptops"
msgstr "Máy tính xách tay"
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
msgid "Firewalls"
msgstr "Tường lửa"
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
msgid "Embedded systems"
msgstr "Các hệ thống nhúng"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
msgid "Press Contact"
msgstr "Liên hệ báo chí"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
msgid "Web Pages"
msgstr "Trang thông tin điện tử"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
msgid "Outreach"
msgstr "Hoạt động ngoài lề"
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
msgid "Debian Women Project"
msgstr "Dự án Phụ nữ Debian"
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
msgid "Anti-harassment"
msgstr "Chống quấy rối"
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
msgid "Events"
msgstr "Sự kiện"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
#, fuzzy
#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Ủy ban kỹ thuật"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
msgid "Partner Program"
msgstr "Chương trình đối tác"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
msgid "Hardware Donations Coordination"
msgstr "Điều phối các quyên góp phần cứng"
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
msgid "User support"
msgstr "Hỗ trợ người dùng"
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
msgid "Bug Tracking System"
msgstr "Hệ thống theo dõi lỗi"
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Quản trị và Lưu trữ các bó thư"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
msgid "New Members Front Desk"
msgstr "Các thành viên Bàn lễ tân mới"
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
msgid "Debian Account Managers"
msgstr "Quản lý các tài khoản Debian"
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Những nhà bảo trì chùm chìa khóa (PGP và GPG)"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
msgid "Security Team"
msgstr "Nhóm bảo mật"
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
msgid "Consultants Page"
msgstr "Trang cố vấn"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
msgid "CD Vendors Page"
msgstr "Trang nhà cung cấp CD"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
msgid "Policy"
msgstr "Chính sách"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
msgid "System Administration"
msgstr "Quản trị hệ thống"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
msgid ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need a package installed."
@@ -322,7 +322,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:430
+#: ../../english/intro/organization.data:432
msgid ""
"If you have hardware problems with Debian machines, please see <a href="
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -332,81 +332,99 @@ 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:431
+#: ../../english/intro/organization.data:433
msgid "LDAP Developer Directory Administrator"
msgstr "Nhà quản trị Thư mục Phát triển LDAP"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
msgid "Mirrors"
msgstr "Máy bản sao"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
msgid "DNS Maintainer"
msgstr "Quản trị DNS"
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
msgid "Package Tracking System"
msgstr "Hệ thống theo dõi lỗi"
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Kiểm soát"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Các yêu cầu dùng <a name=\"trademark\" href=\"m4_HOME/trademark\">nhãn hiệu</"
"a>"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Các quản trị viên Alioth"
+
+#: ../../english/intro/organization.data:457
msgid "Alioth administrators"
msgstr "Các quản trị viên Alioth"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
msgid "Debian for children from 1 to 99"
msgstr "Debian dành cho trẻ em từ 1 đến 99"
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
msgid "Debian for medical practice and research"
msgstr "Debian dành cho nghiên cứu và thực hành y học"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
msgid "Debian for education"
msgstr "Debian dành cho giáo dục"
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
msgid "Debian in legal offices"
msgstr "Debian trong các văn phòng luật"
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
msgid "Debian for people with disabilities"
msgstr "Debian dành cho những người khuyết tật"
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
msgid "Debian for science and related research"
msgstr "Debian dành cho khoa học và nghiên cứu"
-#~ msgid "Publicity"
-#~ msgstr "Publicity"
+#: ../../english/intro/organization.data:492
+#, fuzzy
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian dành cho giáo dục"
-#~ msgid "Bits from Debian"
-#~ msgstr "Bits từ Debian"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Nhà lãnh đạo dự án Debian hiện tại"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Những người quản lý chùm chìa khóa Nhà bảo trì Debian (DM)"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Bạn phân phối Debian tùy chỉnh"
-#~ msgid "DebConf chairs"
-#~ msgstr "Các ghế DebConf"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Nhóm phát hành cho bản ổn định ``stable''"
#~ msgid "Marketing Team"
#~ msgstr "Nhóm tiếp cận thị trường"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Nhóm phát hành cho bản ổn định ``stable''"
+#~ msgid "DebConf chairs"
+#~ msgstr "Các ghế DebConf"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Bạn phân phối Debian tùy chỉnh"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Những người quản lý chùm chìa khóa Nhà bảo trì Debian (DM)"
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Nhà lãnh đạo dự án Debian hiện tại"
+#~ msgid "Bits from Debian"
+#~ msgstr "Bits từ Debian"
+
+#~ msgid "Publicity"
+#~ msgstr "Publicity"
+
+#~ msgid "Auditor"
+#~ msgstr "Kiểm soát"
+
+#~ msgid "Live System Team"
+#~ msgstr "Nhóm hệ thống Live"
diff --git a/vietnamese/po/partners.vi.po b/vietnamese/po/partners.vi.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/vietnamese/po/partners.vi.po
+++ b/vietnamese/po/partners.vi.po
@@ -4,163 +4,154 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
msgstr ""
#: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
msgstr ""
#: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
msgstr ""
#: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
msgstr ""
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
msgstr ""
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
msgstr ""
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
msgstr ""
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
msgstr ""
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
msgstr ""
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
msgstr ""
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
msgstr ""
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
msgstr ""
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
msgstr ""
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
msgstr ""
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
msgid ""
"Since 2002, Genesi has provided the hardware it designs and develops to the "
"Debian community. Genesi also employs Debian developers to support their "
"platforms."
msgstr ""
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
msgid ""
"Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
"based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
"powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
msgstr ""
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
msgstr ""
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
msgstr ""
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
msgstr ""
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
msgstr ""
diff --git a/vietnamese/po/stats.vi.po b/vietnamese/po/stats.vi.po
index d3a938d8a7f..ddc3a7cad51 100644
--- a/vietnamese/po/stats.vi.po
+++ b/vietnamese/po/stats.vi.po
@@ -19,208 +19,217 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
+msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
-msgid "Wrong translation version"
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:286
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
msgid "hits"
msgstr ""
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
msgid "Click to fetch diffstat data"
msgstr ""
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Unified diff"
msgstr ""
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
msgid "Colored diff"
msgstr ""
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
msgid "Created with <transstatslink>"
msgstr ""
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
msgid "Not translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
msgid "Translated"
msgstr ""
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
msgid "Up to date"
msgstr ""
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
msgid "files"
msgstr ""
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
msgid "bytes"
msgstr ""
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
msgid ""
"Note: the lists of pages are sorted by popularity. Hover over the page name "
"to see the number of hits."
msgstr ""
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
msgid "File"
msgstr ""
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
msgid "Log"
msgstr ""
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
msgid "Translator"
msgstr ""
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/vietnamese/po/templates.vi.po b/vietnamese/po/templates.vi.po
index 7bc774d18d2..fd38fd560ca 100644
--- a/vietnamese/po/templates.vi.po
+++ b/vietnamese/po/templates.vi.po
@@ -207,11 +207,11 @@ msgstr "trong bản phát hành 2.2"
#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
#| "using_cvs\">available</a>."
msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian."
-"org</a>. For other contact information, see the Debian <a href=\"m4_HOME/"
-"contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English. For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
"Để báo cáo các lỗi trong trang thông tin điện tử, gửi thư điện tử đến <a "
"href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. "
@@ -510,6 +510,10 @@ msgid ""
"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Chú ý:</em> Tài liệu gốc của bản dịch này không còn tồn tại nữa."
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
#: ../../english/template/debian/url.wml:4
msgid "URL"
msgstr "URL"
diff --git a/vietnamese/po/vendors.vi.po b/vietnamese/po/vendors.vi.po
index 22536f2753b..e518d1e5016 100644
--- a/vietnamese/po/vendors.vi.po
+++ b/vietnamese/po/vendors.vi.po
@@ -68,37 +68,37 @@ msgstr "nguồn"
msgid "and"
msgstr "và"
-#~ msgid "Architectures:"
-#~ msgstr "Các kiến trúc:"
+#~ msgid "Vendor:"
+#~ msgstr "Nhà cung cấp:"
-#~| msgid "CD Type:"
-#~ msgid "USB Type:"
-#~ msgstr "Kiểu USB:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL cho trang Debian:"
-#~| msgid "CD Type:"
-#~ msgid "BD Type:"
-#~ msgstr "Kiểu BD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Cho phép các phần đóng góp cho Debian:"
-#~ msgid "DVD Type:"
-#~ msgstr "Kiểu DVD:"
+#~ msgid "Country:"
+#~ msgstr "Nước:"
-#~ msgid "CD Type:"
-#~ msgstr "Kiểu CD:"
+#~ msgid "Ship International:"
+#~ msgstr "Vận chuyển quốc tế:"
#~ msgid "email:"
#~ msgstr "thư điện tử:"
-#~ msgid "Ship International:"
-#~ msgstr "Vận chuyển quốc tế:"
+#~ msgid "CD Type:"
+#~ msgstr "Kiểu CD:"
-#~ msgid "Country:"
-#~ msgstr "Nước:"
+#~ msgid "DVD Type:"
+#~ msgstr "Kiểu DVD:"
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Cho phép các phần đóng góp cho Debian:"
+#~| msgid "CD Type:"
+#~ msgid "BD Type:"
+#~ msgstr "Kiểu BD:"
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL cho trang Debian:"
+#~| msgid "CD Type:"
+#~ msgid "USB Type:"
+#~ msgstr "Kiểu USB:"
-#~ msgid "Vendor:"
-#~ msgstr "Nhà cung cấp:"
+#~ msgid "Architectures:"
+#~ msgstr "Các kiến trúc:"

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