Merge branch 'master' into new-homepage

7 files changed, 214 insertions, 275 deletions

diff --git a/english/po/Makefile b/english/po/Makefile
index 43fde569beb..58425a4f9f1 100644
--- a/english/po/Makefile
+++ b/english/po/Makefile
@@ -61,7 +61,6 @@ others_FILES    = \
   $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/distrib/pre-installed.defs \
   $(ENGLISHDIR)/logos/index.data \
   $(ENGLISHDIR)/events/merchandise.def \
-  $(ENGLISHDIR)/y2k/l10n.data \
   $(ENGLISHDIR)/devel/join/nm-steps.inc \
   $(ENGLISHDIR)/mirror/submit.inc \
   $(ENGLISHDIR)/women/profiles/profiles.def
diff --git a/english/po/cdimage.pot b/english/po/cdimage.pot
index 91ceec330a4..c2cb82c5356 100644
--- a/english/po/cdimage.pot
+++ b/english/po/cdimage.pot
@@ -57,42 +57,38 @@ msgid "<void id=\"dc_torrent\" />Download with Torrent"
 msgstr ""
 
 #: ../../english/template/debian/cdimage.wml:49
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:52
 msgid "Debian CD team"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:55
+#: ../../english/template/debian/cdimage.wml:52
 msgid "debian_on_cd"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:58
+#: ../../english/template/debian/cdimage.wml:55
 msgid "<void id=\"faq-bottom\" />faq"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:61
+#: ../../english/template/debian/cdimage.wml:58
 msgid "jigdo"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:64
+#: ../../english/template/debian/cdimage.wml:61
 msgid "http_ftp"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:67
+#: ../../english/template/debian/cdimage.wml:64
 msgid "buy"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:70
+#: ../../english/template/debian/cdimage.wml:67
 msgid "net_install"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:73
+#: ../../english/template/debian/cdimage.wml:70
 msgid "<void id=\"misc-bottom\" />misc"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:76
+#: ../../english/template/debian/cdimage.wml:73
 msgid "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</a> for CDs/DVDs:"
 msgstr ""
 
diff --git a/english/po/countries.pot b/english/po/countries.pot
index e948456d938..03a63df5bb6 100644
--- a/english/po/countries.pot
+++ b/english/po/countries.pot
@@ -216,210 +216,214 @@ msgid "Kyrgyzstan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:270
-msgid "Korea"
+msgid "Cambodia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:273
-msgid "Kuwait"
+msgid "Korea"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:276
-msgid "Kazakhstan"
+msgid "Kuwait"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:279
-msgid "Sri Lanka"
+msgid "Kazakhstan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:282
-msgid "Lithuania"
+msgid "Sri Lanka"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:285
-msgid "Luxembourg"
+msgid "Lithuania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:288
-msgid "Latvia"
+msgid "Luxembourg"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:291
-msgid "Morocco"
+msgid "Latvia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:294
-msgid "Moldova"
+msgid "Morocco"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:297
-msgid "Montenegro"
+msgid "Moldova"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:300
-msgid "Madagascar"
+msgid "Montenegro"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:303
-msgid "Macedonia, Republic of"
+msgid "Madagascar"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:306
-msgid "Mongolia"
+msgid "Macedonia, Republic of"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:309
-msgid "Malta"
+msgid "Mongolia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:312
-msgid "Mexico"
+msgid "Malta"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:315
-msgid "Malaysia"
+msgid "Mexico"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:318
-msgid "New Caledonia"
+msgid "Malaysia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:321
-msgid "Nicaragua"
+msgid "New Caledonia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:324
-msgid "Netherlands"
+msgid "Nicaragua"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:327
-msgid "Norway"
+msgid "Netherlands"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:330
-msgid "New Zealand"
+msgid "Norway"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:333
-msgid "Panama"
+msgid "New Zealand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:336
-msgid "Peru"
+msgid "Panama"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:339
-msgid "French Polynesia"
+msgid "Peru"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:342
-msgid "Philippines"
+msgid "French Polynesia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:345
-msgid "Pakistan"
+msgid "Philippines"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:348
-msgid "Poland"
+msgid "Pakistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:351
-msgid "Portugal"
+msgid "Poland"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:354
-msgid "Réunion"
+msgid "Portugal"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:357
-msgid "Romania"
+msgid "Réunion"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:360
-msgid "Serbia"
+msgid "Romania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:363
-msgid "Russia"
+msgid "Serbia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:366
-msgid "Saudi Arabia"
+msgid "Russia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:369
-msgid "Sweden"
+msgid "Saudi Arabia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:372
-msgid "Singapore"
+msgid "Sweden"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:375
-msgid "Slovenia"
+msgid "Singapore"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:378
-msgid "Slovakia"
+msgid "Slovenia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:381
-msgid "El Salvador"
+msgid "Slovakia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:384
-msgid "Thailand"
+msgid "El Salvador"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:387
-msgid "Tajikistan"
+msgid "Thailand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:390
-msgid "Tunisia"
+msgid "Tajikistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:393
-msgid "Turkey"
+msgid "Tunisia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:396
-msgid "Taiwan"
+msgid "Turkey"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:399
-msgid "Ukraine"
+msgid "Taiwan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:402
-msgid "United States"
+msgid "Ukraine"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:405
-msgid "Uruguay"
+msgid "United States"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:408
-msgid "Uzbekistan"
+msgid "Uruguay"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:411
-msgid "Venezuela"
+msgid "Uzbekistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:414
-msgid "Vietnam"
+msgid "Venezuela"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:417
-msgid "Vanuatu"
+msgid "Vietnam"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:420
-msgid "South Africa"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:423
+msgid "South Africa"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:426
 msgid "Zimbabwe"
 msgstr ""
 
diff --git a/english/po/newsevents.pot b/english/po/newsevents.pot
index e424519287e..b3cb14be79c 100644
--- a/english/po/newsevents.pot
+++ b/english/po/newsevents.pot
@@ -142,112 +142,120 @@ msgstr ""
 msgid "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for the Debian community. Topics covered in this issue include:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:56
-#: ../../english/template/debian/projectnews/boilerplates.wml:77
+#: ../../english/template/debian/projectnews/boilerplates.wml:43
+msgid "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for the Debian community."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:49
+msgid "Other topics covered in this issue include:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:69
+#: ../../english/template/debian/projectnews/boilerplates.wml:90
 msgid "According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search interface of the Ultimate Debian Database</a>, the upcoming release, Debian  <q><get-var release /></q>, is currently affected by <get-var testing /> Release-Critical bugs. Ignoring bugs which are easily solved or on the way to being solved, roughly speaking, about <get-var tobefixed /> Release-Critical bugs remain to be solved for the release to happen."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:57
+#: ../../english/template/debian/projectnews/boilerplates.wml:70
 msgid "There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:78
+#: ../../english/template/debian/projectnews/boilerplates.wml:91
 msgid "There are also <a href=\"<get-var url />\">more detailed statistics</a> as well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:102
+#: ../../english/template/debian/projectnews/boilerplates.wml:115
 msgid "<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which need your help</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:114
+#: ../../english/template/debian/projectnews/boilerplates.wml:127
 msgid "Please help us create this newsletter. We still need more volunteer writers to watch the Debian community and report about what is going on. Please see the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute\">contributing page</a> to find out how to help. We're looking forward to receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:175
+#: ../../english/template/debian/projectnews/boilerplates.wml:188
 msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a>) for announcements."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:176
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
 msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a> or <a href=\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-stable /></q>, the oldstable distribution) for announcements."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:185
+#: ../../english/template/debian/projectnews/boilerplates.wml:198
 msgid "Debian's Stable Release Team released an update announcement for the package: "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:187
 #: ../../english/template/debian/projectnews/boilerplates.wml:200
 #: ../../english/template/debian/projectnews/boilerplates.wml:213
-#: ../../english/template/debian/projectnews/boilerplates.wml:344
-#: ../../english/template/debian/projectnews/boilerplates.wml:358
+#: ../../english/template/debian/projectnews/boilerplates.wml:226
+#: ../../english/template/debian/projectnews/boilerplates.wml:357
+#: ../../english/template/debian/projectnews/boilerplates.wml:371
 msgid ", "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:188
 #: ../../english/template/debian/projectnews/boilerplates.wml:201
 #: ../../english/template/debian/projectnews/boilerplates.wml:214
-#: ../../english/template/debian/projectnews/boilerplates.wml:345
-#: ../../english/template/debian/projectnews/boilerplates.wml:359
+#: ../../english/template/debian/projectnews/boilerplates.wml:227
+#: ../../english/template/debian/projectnews/boilerplates.wml:358
+#: ../../english/template/debian/projectnews/boilerplates.wml:372
 msgid " and "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:189
 #: ../../english/template/debian/projectnews/boilerplates.wml:202
 #: ../../english/template/debian/projectnews/boilerplates.wml:215
+#: ../../english/template/debian/projectnews/boilerplates.wml:228
 msgid ". "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:189
 #: ../../english/template/debian/projectnews/boilerplates.wml:202
 #: ../../english/template/debian/projectnews/boilerplates.wml:215
+#: ../../english/template/debian/projectnews/boilerplates.wml:228
 msgid "Please read them carefully and take the proper measures."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:198
+#: ../../english/template/debian/projectnews/boilerplates.wml:211
 msgid "Debian's Backports Team released advisories for these packages: "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:211
+#: ../../english/template/debian/projectnews/boilerplates.wml:224
 msgid "Debian's Security Team recently released advisories for these packages (among others): "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:240
+#: ../../english/template/debian/projectnews/boilerplates.wml:253
 msgid "<get-var num-newpkg /> packages were added to the unstable Debian archive recently."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:242
+#: ../../english/template/debian/projectnews/boilerplates.wml:255
 msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:269
+#: ../../english/template/debian/projectnews/boilerplates.wml:282
 msgid "There are several upcoming Debian-related events:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:275
+#: ../../english/template/debian/projectnews/boilerplates.wml:288
 msgid "You can find more information about Debian-related events and talks on the <a href=\"<get-var events-section />\">events section</a> of the Debian web site, or subscribe to one of our events mailing lists for different regions: <a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:300
+#: ../../english/template/debian/projectnews/boilerplates.wml:313
 msgid "Do you want to organise a Debian booth or a Debian install party? Are you aware of other upcoming Debian-related events? Have you delivered a Debian talk that you want to link on our <a href=\"<get-var events-talks />\">talks page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian Events Team</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:322
+#: ../../english/template/debian/projectnews/boilerplates.wml:335
 msgid "<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />\">accepted</a> as Debian Developers"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:329
+#: ../../english/template/debian/projectnews/boilerplates.wml:342
 msgid "<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />\">accepted</a> as Debian Maintainers"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:336
+#: ../../english/template/debian/projectnews/boilerplates.wml:349
 msgid "<get-var uploader-num /> people have <a href=\"<get-var uploader-url />\">started to maintain packages</a>"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:381
+#: ../../english/template/debian/projectnews/boilerplates.wml:394
 msgid "<get-var eval-newcontributors-text-list /> since the previous issue of the Debian Project News. Please welcome <get-var eval-newcontributors-name-list /> into our project!"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:394
+#: ../../english/template/debian/projectnews/boilerplates.wml:407
 msgid "The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-news />\">miscellaneous news for developers</a> has been released and covers the following topics:"
 msgstr ""
 
diff --git a/english/po/organization.pot b/english/po/organization.pot
index f5ab07f05e9..73d136b91d6 100644
--- a/english/po/organization.pot
+++ b/english/po/organization.pot
@@ -105,27 +105,27 @@ msgid "Distribution"
 msgstr ""
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:209
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:212
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:217
 msgid "Publicity team"
 msgstr ""
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:319
+#: ../../english/intro/organization.data:290
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:318
 msgid "Support and Infrastructure"
 msgstr ""
 
@@ -229,187 +229,163 @@ msgstr ""
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:200
-msgid "Ports"
-msgstr ""
-
-#: ../../english/intro/organization.data:230
-msgid "Special Configurations"
-msgstr ""
-
-#: ../../english/intro/organization.data:232
-msgid "Laptops"
-msgstr ""
-
-#: ../../english/intro/organization.data:233
-msgid "Firewalls"
-msgstr ""
-
-#: ../../english/intro/organization.data:234
-msgid "Embedded systems"
-msgstr ""
-
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:220
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:251
+#: ../../english/intro/organization.data:222
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:234
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:268
+#: ../../english/intro/organization.data:239
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:244
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:252
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:261
 msgid "To send a private message to all the members of the Community Team, use the GPG key <a href=\"community-team-pubkey.txt\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:263
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:299
+#: ../../english/intro/organization.data:270
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:306
+#: ../../english/intro/organization.data:277
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:310
+#: ../../english/intro/organization.data:281
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:325
+#: ../../english/intro/organization.data:296
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:327
+#: ../../english/intro/organization.data:298
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:300
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:331
+#: ../../english/intro/organization.data:302
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:333
+#: ../../english/intro/organization.data:304
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:305
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:337
+#: ../../english/intro/organization.data:308
 msgid "OASIS: Organization\n      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:311
 msgid "OVAL: Open Vulnerability\n      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:314
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:350
-msgid "User support"
-msgstr ""
-
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:321
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:326
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:335
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:341
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:441
+#: ../../english/intro/organization.data:345
 msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:442
+#: ../../english/intro/organization.data:346
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:350
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:457
+#: ../../english/intro/organization.data:361
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:366
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:369
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:372
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:469
+#: ../../english/intro/organization.data:373
 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:479
+#: ../../english/intro/organization.data:383
 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:480
+#: ../../english/intro/organization.data:384
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:385
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:488
+#: ../../english/intro/organization.data:392
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:393
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:491
+#: ../../english/intro/organization.data:395
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:498
+#: ../../english/intro/organization.data:402
 msgid "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:502
+#: ../../english/intro/organization.data:406
 msgid "Salsa administrators"
 msgstr ""
 
diff --git a/english/po/others.pot b/english/po/others.pot
index 4853a7c4c67..f69ed8e91aa 100644
--- a/english/po/others.pot
+++ b/english/po/others.pot
@@ -3,14 +3,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/banners/index.tags:7
-msgid "Download"
-msgstr ""
-
-#: ../../english/banners/index.tags:11
-msgid "Old banner ads"
-msgstr ""
-
 #: ../../english/devel/debian-installer/ports-status.defs:10
 msgid "Working"
 msgstr ""
@@ -211,50 +203,6 @@ msgstr ""
 msgid "Money is used to organize local free software events"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:18
-msgid "??"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
-msgstr ""
-
 #: ../../english/devel/join/nm-steps.inc:7
 msgid "New Members Corner"
 msgstr ""
diff --git a/english/po/partners.pot b/english/po/partners.pot
index b77e273438e..237b5333be6 100644
--- a/english/po/partners.pot
+++ b/english/po/partners.pot
@@ -63,199 +63,207 @@ msgstr ""
 msgid "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 <a href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:82
-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. "
+#: ../../english/partners/partners.def:83
+msgid "<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with hosting services from their colocation sites via high-speed connection."
 msgstr ""
 
-#: ../../english/partners/partners.def:86
+#: ../../english/partners/partners.def:87
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:92
+#: ../../english/partners/partners.def:93
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:95
+#: ../../english/partners/partners.def:96
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:102
-msgid "<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>."
+#: ../../english/partners/partners.def:103
+msgid "<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> and <a href=\"http://security.debian.org\">security.debian.org</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:105
+#: ../../english/partners/partners.def:106
 msgid "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:112
+#: ../../english/partners/partners.def:113
 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:115
+#: ../../english/partners/partners.def:116
 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 resources to the mass market. For information about Genesi's involvement in the Linux Open Source community, please visit <a href=\"http://www.powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
 msgstr ""
 
-#: ../../english/partners/partners.def:122
+#: ../../english/partners/partners.def:123
 msgid "<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's continuous integration infrastructure within Google Cloud Platform."
 msgstr ""
 
-#: ../../english/partners/partners.def:125
+#: ../../english/partners/partners.def:126
 msgid "Google is one of the largest technology companies in the world, providing a wide range of Internet-related services and products as online advertising technologies, search, cloud computing, software, and hardware."
 msgstr ""
 
 #: ../../english/partners/partners.def:132
-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)."
+msgid "<a href=\"https://www.hetzner.com\">Hetzner</a> provides the Debian project with hosting services."
 msgstr ""
 
 #: ../../english/partners/partners.def:135
+msgid "Hetzner Online is a professional web hosting provider and experienced data center operator. Since 1997 the company has provided private and business clients with high-performance hosting products as well as the necessary infrastructure for the efficient operation of websites. A combination of stable technology, attractive pricing and flexible support and services has enabled Hetzner Online to continuously strengthen its market position both nationally and internationally. The company owns several data centers in Germany and Finland."
+msgstr ""
+
+#: ../../english/partners/partners.def:142
+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:145
 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:143
-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."
+#: ../../english/partners/partners.def:153
+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 300 Terabytes (TB) of capacity. In 2020 they renewed their support by provisioning new dedicated servers with bigger disk drives, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
 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>."
 msgstr ""
 
-#: ../../english/partners/partners.def:152
+#: ../../english/partners/partners.def:162
 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 Debian. For information about Loongson's involvement in the Linux community, see <a href=\"http://dev.lemote.com/code/linux-loongson-community\">Linux at Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:155
+#: ../../english/partners/partners.def:165
 msgid "Loongson processors are a series of MIPS-compatible processors. They have been widely used in many areas, such as desktop, server, embedded application, high-performance computing etc. For more information, contact <a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:161
-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."
+#: ../../english/partners/partners.def:172
+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."
 msgstr ""
 
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:176
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:173
+#: ../../english/partners/partners.def:183
 msgid "<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</a> provides hosting and administration services to the Debian project."
 msgstr ""
 
-#: ../../english/partners/partners.def:177
+#: ../../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."
 msgstr ""
 
-#: ../../english/partners/partners.def:184
+#: ../../english/partners/partners.def:194
 msgid "nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically disperse locations and support DNSSEC."
 msgstr ""
 
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
 msgid "ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has been managing the .at-zone since 1998 on a highly professional and reliable level. The RcodeZero Anycast network has been developed by nic.at’s R&amp;D department and has been successfully in use for the .at zone."
 msgstr ""
 
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
 msgid "<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in both the creation and testing of the new debian-installer and the localization of Debian."
 msgstr ""
 
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:204
+#: ../../english/partners/partners.def:214
 msgid "<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides Debian with content delivery network (CDN) services, allowing high availability of services like <a href=\"https://security-tracker.debian.org/\">the Security Bug Tracker</a> and <a href=\"https://planet.debian.org/\">Planet Debian</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:207
+#: ../../english/partners/partners.def:217
 msgid "StackPath is a platform of secure edge services that enables developers to protect, accelerate, and innovate cloud properties ranging from websites to media delivery and IoT services."
 msgstr ""
 
-#: ../../english/partners/partners.def:213
-msgid "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is supporting the Debian community by donating hardware, rackspace and bandwidth for the Debian server hosting alioth, arch and svn."
-msgstr ""
-
-#: ../../english/partners/partners.def:216
-msgid "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins are highly motivated Debian users and some of them also Debian maintainers."
-msgstr ""
-
-#: ../../english/partners/partners.def:219
-msgid "Telegraaf Media Group runs some of the most popular Dutch websites (http://www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as the two biggest newspapers in The Netherlands."
-msgstr ""
-
-#: ../../english/partners/partners.def:225
+#: ../../english/partners/partners.def:223
 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>."
 msgstr ""
 
-#: ../../english/partners/partners.def:228
+#: ../../english/partners/partners.def:226
 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!"
 msgstr ""
 
-#: ../../english/partners/partners.def:234
+#: ../../english/partners/partners.def:232
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:237
+#: ../../english/partners/partners.def:235
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:245
+#: ../../english/partners/partners.def:243
 msgid "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> provides infrastructure for the <a href=\"https://snapshot.debian.org/\">Debian OS Snapshot Archive</a> since the creation of the service in <a href=\"https://www.debian.org/News/2010/20100412\">April 2010</a>. In 2018 they renewed their support by provisioning a new frontend server and increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:248
+#: ../../english/partners/partners.def:246
 msgid "The Wellcome Sanger Institute is one of the world's leading genome centres. Through its ability to conduct research at scale, it is able to engage in bold and long-term exploratory projects that are designed to influence and empower medical science globally. Institute research findings, generated through its own research programmes and through its leading role in international consortia, are being used to develop new diagnostics and treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:258
+#: ../../english/partners/partners.def:256
 msgid "<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called Novare) provides several machines to Debian, as well as hosting and server administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:261
+#: ../../english/partners/partners.def:259
 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>."
 msgstr ""
 
-#: ../../english/partners/partners.def:268
+#: ../../english/partners/partners.def:266
 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:271
+#: ../../english/partners/partners.def:269
 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:278
+#: ../../english/partners/partners.def:276
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:282
+#: ../../english/partners/partners.def:280
 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>."
 msgstr ""
 
-#: ../../english/partners/partners.def:289
+#: ../../english/partners/partners.def:287
 msgid "<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports Debian (and SPI Inc) by providing domain registration facilities.</p><p>They are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:296
+#: ../../english/partners/partners.def:294
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:303
+#: ../../english/partners/partners.def:301
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:304
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:314
+#: ../../english/partners/partners.def:312
 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:317
+#: ../../english/partners/partners.def:315
 msgid "It hosts a Debian development machine, <a href=\"https://db.debian.org/machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:325
+#: ../../english/partners/partners.def:323
 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:328
+#: ../../english/partners/partners.def:326
 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 ""
 
+#: ../../english/partners/partners.def:334
+msgid "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is supporting the Debian community by donating hardware, rackspace and bandwidth for the Debian server hosting alioth, arch and svn."
+msgstr ""
+
+#: ../../english/partners/partners.def:337
+msgid "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins are highly motivated Debian users and some of them also Debian maintainers."
+msgstr ""
+
+#: ../../english/partners/partners.def:340
+msgid "Telegraaf Media Group runs some of the most popular Dutch websites (http://www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as the two biggest newspapers in The Netherlands."
+msgstr ""
+