Merge branch 'master' into new-homepage

8 files changed, 349 insertions, 314 deletions

diff --git a/english/po/blends.pot b/english/po/blends.pot
index d15fd47e114..ed97fed9487 100644
--- a/english/po/blends.pot
+++ b/english/po/blends.pot
@@ -51,6 +51,10 @@ msgstr ""
 msgid "The goal of Debian Science is to provide a better experience when using Debian to researchers and scientists."
 msgstr ""
 
+#: ../../english/blends/released.data:89
+msgid "The goal of FreedomBox is to develop, design and promote personal servers running free software for private, personal communications. Applications include blogs, wikis, websites, social networks, email, web proxy and a Tor relay on a device that can replace a wireless router so that data stays with the users."
+msgstr ""
+
 #: ../../english/blends/unreleased.data:15
 msgid "The goal of Debian Accessibility is to develop Debian into an operating system that is particularly well suited for the requirements of people with disabilities."
 msgstr ""
@@ -64,14 +68,10 @@ msgid "The goal of Debian EzGo is to provide culture-based open and free technol
 msgstr ""
 
 #: ../../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 include blogs, wikis, websites, social networks, email, web proxy and a Tor relay on a device that can replace a wireless router so that data stays with the users."
-msgstr ""
-
-#: ../../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:55
+#: ../../english/blends/unreleased.data:47
 msgid "The goal of DebianParl is to provide applications to support the needs of parliamentarians, politicians and their staffers all around the world."
 msgstr ""
 
diff --git a/english/po/doc.pot b/english/po/doc.pot
index fc96fea4a6a..58ddad0afc3 100644
--- a/english/po/doc.pot
+++ b/english/po/doc.pot
@@ -47,94 +47,74 @@ msgstr ""
 msgid "Availability:"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:97
+#: ../../english/doc/manuals.defs:85
 msgid "Latest version:"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:113
+#: ../../english/doc/manuals.defs:101
 msgid "(version <get-var version />)"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:143
+#: ../../english/doc/manuals.defs:131
 #: ../../english/releases/arches.data:38
 msgid "plain text"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:159
-#: ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
+#: ../../english/doc/manuals.defs:147
+#: ../../english/doc/manuals.defs:157
+#: ../../english/doc/manuals.defs:165
 msgid "The latest <get-var srctype /> source is available through the <a href=\"https://packages.debian.org/git\">Git</a> repository."
 msgstr ""
 
-#: ../../english/doc/manuals.defs:161
-#: ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179
-#: ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
+#: ../../english/doc/manuals.defs:149
+#: ../../english/doc/manuals.defs:159
+#: ../../english/doc/manuals.defs:167
 msgid "Web interface: "
 msgstr ""
 
-#: ../../english/doc/manuals.defs:162
-#: ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180
-#: ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
+#: ../../english/doc/manuals.defs:150
+#: ../../english/doc/manuals.defs:160
+#: ../../english/doc/manuals.defs:168
 msgid "VCS interface: "
 msgstr ""
 
-#: ../../english/doc/manuals.defs:177
-msgid "The latest <get-var srctype /> source is available through the <a href=\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-
-#: ../../english/doc/manuals.defs:185
-msgid "The latest <get-var srctype /> source is available through the <a href=\"https://packages.debian.org/subversion\">Subversion</a> repository."
-msgstr ""
-
-#: ../../english/doc/manuals.defs:203
-msgid "CVS sources working copy: set <code>CVSROOT</code>\n  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n  and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr ""
-
-#: ../../english/doc/manuals.defs:208
-msgid "CVS via web"
-msgstr ""
-
-#: ../../english/doc/manuals.defs:212
-#: ../../english/doc/manuals.defs:216
+#: ../../english/doc/manuals.defs:175
+#: ../../english/doc/manuals.defs:179
 msgid "Debian package"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:221
-#: ../../english/doc/manuals.defs:225
+#: ../../english/doc/manuals.defs:184
+#: ../../english/doc/manuals.defs:188
 msgid "Debian package (archived)"
 msgstr ""
 
-#: ../../english/doc/books.data:32
+#: ../../english/doc/books.data:35
 msgid "\n  Debian 9 is the must-have handbook for learning Linux. Start on the\n  beginners level and learn how to deploy the system with graphical\n  interface and terminal.\n  This book provides the basic knowledge to grow and become a 'junior'\n  systems administrator. Start off with exploring the GNOME desktop\n  interface and adjust it to your personal needs. Overcome your fear of\n  using the Linux terminal and learn the most essential commands in\n  administering Debian. Expand your knowledge of system services (systemd)\n  and learn how to adapt them. Get more out of the software in Debian and\n  outside of Debian. Manage your home-network with network-manager, etc.\n  10 percent of the profits on this book will be donated to the Debian\n  Project."
 msgstr ""
 
-#: ../../english/doc/books.data:61
-#: ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
+#: ../../english/doc/books.data:64
+#: ../../english/doc/books.data:174
+#: ../../english/doc/books.data:229
 msgid "Written by two Debian developers, this free book\n  started as a translation of their French best-seller known as Cahier de\n  l'admin Debian (published by Eyrolles). Accessible to all, this book\n  teaches the essentials to anyone who wants to become an effective and\n  independent Debian GNU/Linux administrator.\n  It covers all the topics that a competent Linux administrator should\n  master, from the installation and the update of the system, up to the\n  creation of packages and the compilation of the kernel, but also\n  monitoring, backup and migration, without forgetting advanced topics\n  like SELinux setup to secure services, automated installations, or\n  virtualization with Xen, KVM or LXC."
 msgstr ""
 
-#: ../../english/doc/books.data:83
+#: ../../english/doc/books.data:86
 msgid "The aim of this freely available, up-to-date, book is to get you up to\n  speed with Debian (including both the current stable release and the\n  current unstable distribution). It is comprehensive with basic support\n  for the user who installs and maintains the system themselves (whether\n  in the home, office, club, or school)."
 msgstr ""
 
-#: ../../english/doc/books.data:105
+#: ../../english/doc/books.data:108
 msgid "The first French book about Debian is already in its fifth edition. It\n  covers all aspects of the administration of Debian from the installation\n  to the configuration of network services.\n  Written by two Debian developers, this book can be of interest to many\n  people: the beginner wishing to discover Debian, the advanced user looking\n  for tips to enhance his mastership of the Debian tools and the\n  administrator who wants to build a reliable network with Debian."
 msgstr ""
 
-#: ../../english/doc/books.data:125
+#: ../../english/doc/books.data:128
 msgid "The book covers topics ranging from concepts of package\n  management over the available tools and how they're used to concrete problems\n  which may occur in real life and how they can be solved. The book is written\n  in German, an English translation is planned. Format: e-book (Online, HTML,\n  PDF, ePub, Mobi), printed book planned.\n"
 msgstr ""
 
-#: ../../english/doc/books.data:146
+#: ../../english/doc/books.data:149
 msgid "This book teaches you how to install and configure the system and also how to use Debian in a professional environment.  It shows the full potential of the distribution (in its current version 8) and provides a practical manual for all users who want to learn more about Debian and its range of services."
 msgstr ""
 
-#: ../../english/doc/books.data:200
+#: ../../english/doc/books.data:203
 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 ""
 
diff --git a/english/po/organization.pot b/english/po/organization.pot
index 97cb26bd678..f5ab07f05e9 100644
--- a/english/po/organization.pot
+++ b/english/po/organization.pot
@@ -13,373 +13,403 @@ msgstr ""
 
 #. One male delegate
 #: ../../english/intro/organization.data:18
+#. Pronoun tags with delegate combinations
+#: ../../english/intro/organization.data:22
 msgid "<void id=\"male\"/>delegate"
 msgstr ""
 
 #. One female delegate
 #: ../../english/intro/organization.data:20
+#: ../../english/intro/organization.data:23
 msgid "<void id=\"female\"/>delegate"
 msgstr ""
 
-#: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:22
 #: ../../english/intro/organization.data:25
-msgid "current"
+msgid "<void id=\"he_him\"/>he/him"
+msgstr ""
+
+#: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:26
+msgid "<void id=\"she_her\"/>she/her"
+msgstr ""
+
+#: ../../english/intro/organization.data:24
+msgid "<void id=\"gender_neutral\"/>delegate"
 msgstr ""
 
+#: ../../english/intro/organization.data:24
 #: ../../english/intro/organization.data:27
-#: ../../english/intro/organization.data:29
-msgid "member"
+msgid "<void id=\"they_them\"/>they/them"
 msgstr ""
 
+#: ../../english/intro/organization.data:30
 #: ../../english/intro/organization.data:32
-msgid "manager"
+msgid "current"
 msgstr ""
 
 #: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:36
+msgid "member"
+msgstr ""
+
+#: ../../english/intro/organization.data:39
+msgid "manager"
+msgstr ""
+
+#: ../../english/intro/organization.data:41
 msgid "Stable Release Manager"
 msgstr ""
 
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:41
 msgid "SRM"
 msgstr ""
 
-#: ../../english/intro/organization.data:36
+#: ../../english/intro/organization.data:43
 msgid "wizard"
 msgstr ""
 
 #. we only use the chair tag once, for techctte, I wonder why it's here.
-#: ../../english/intro/organization.data:38
+#: ../../english/intro/organization.data:45
 msgid "chair"
 msgstr ""
 
-#: ../../english/intro/organization.data:41
+#: ../../english/intro/organization.data:48
 msgid "assistant"
 msgstr ""
 
-#: ../../english/intro/organization.data:43
+#: ../../english/intro/organization.data:50
 msgid "secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:45
+#: ../../english/intro/organization.data:52
 msgid "representative"
 msgstr ""
 
-#: ../../english/intro/organization.data:47
+#: ../../english/intro/organization.data:54
 msgid "role"
 msgstr ""
 
-#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:62
+msgid "In the following list, <q>current</q> is used for positions that are\ntransitional (elected or appointed with a certain expiration date)."
+msgstr ""
+
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:82
 msgid "Officers"
 msgstr ""
 
-#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:108
 msgid "Distribution"
 msgstr ""
 
-#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:239
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:242
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:246
 msgid "Publicity team"
 msgstr ""
 
-#: ../../english/intro/organization.data:70
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:319
 msgid "Membership in other organizations"
 msgstr ""
 
-#: ../../english/intro/organization.data:71
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:78
+#: ../../english/intro/organization.data:347
 msgid "Support and Infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:78
+#: ../../english/intro/organization.data:85
 msgid "Leader"
 msgstr ""
 
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
 msgid "Technical Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
 msgid "Secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
 msgid "Development Projects"
 msgstr ""
 
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:112
 msgid "FTP Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:114
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
 msgid "FTP Assistants"
 msgstr ""
 
-#: ../../english/intro/organization.data:116
+#: ../../english/intro/organization.data:126
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:130
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:132
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:136
 msgid "Release Management"
 msgstr ""
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:138
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:147
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:142
+#: ../../english/intro/organization.data:148
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:149
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:150
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
-msgid "CD Images"
+#: ../../english/intro/organization.data:152
+msgid "CD/DVD/USB Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:154
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:156
+#: ../../english/intro/organization.data:161
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:163
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:162
+#: ../../english/intro/organization.data:167
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:169
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:171
+#: ../../english/intro/organization.data:176
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:189
+#: ../../english/intro/organization.data:193
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:194
+#: ../../english/intro/organization.data:198
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:200
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:230
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:232
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:233
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:234
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:249
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:251
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:263
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:268
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:269
+#: ../../english/intro/organization.data:273
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:277
-msgid "Anti-harassment"
+#: ../../english/intro/organization.data:281
+msgid "Community"
+msgstr ""
+
+#: ../../english/intro/organization.data:290
+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:282
+#: ../../english/intro/organization.data:292
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:299
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:306
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:301
+#: ../../english/intro/organization.data:310
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:317
+#: ../../english/intro/organization.data:325
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:319
+#: ../../english/intro/organization.data:327
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:329
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:323
+#: ../../english/intro/organization.data:331
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:325
+#: ../../english/intro/organization.data:333
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:334
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:337
 msgid "OASIS: Organization\n      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:340
 msgid "OVAL: Open Vulnerability\n      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:343
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:342
+#: ../../english/intro/organization.data:350
 msgid "User support"
 msgstr ""
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:417
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:422
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:431
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:437
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:441
 msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:442
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:446
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:457
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:462
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:465
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:459
+#: ../../english/intro/organization.data:468
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:469
 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:469
+#: ../../english/intro/organization.data:479
 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:470
+#: ../../english/intro/organization.data:480
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:481
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:488
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:489
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:491
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:488
+#: ../../english/intro/organization.data:498
 msgid "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:491
+#: ../../english/intro/organization.data:502
 msgid "Salsa administrators"
 msgstr ""
 
diff --git a/english/po/others.pot b/english/po/others.pot
index ce0bacb9c3f..4853a7c4c67 100644
--- a/english/po/others.pot
+++ b/english/po/others.pot
@@ -59,6 +59,7 @@ msgstr ""
 #: ../../english/devel/website/tc.data:14
 #: ../../english/devel/website/tc.data:15
 #: ../../english/devel/website/tc.data:16
+#: ../../english/events/merchandise.def:145
 msgid "More information"
 msgstr ""
 
@@ -106,91 +107,107 @@ msgstr ""
 msgid "[Debian] (mini button)"
 msgstr ""
 
-#: ../../english/events/merchandise.def:10
+#: ../../english/events/merchandise.def:13
 msgid "Products"
 msgstr ""
 
-#: ../../english/events/merchandise.def:13
+#: ../../english/events/merchandise.def:16
 msgid "T-shirts"
 msgstr ""
 
-#: ../../english/events/merchandise.def:16
+#: ../../english/events/merchandise.def:19
 msgid "hats"
 msgstr ""
 
-#: ../../english/events/merchandise.def:19
+#: ../../english/events/merchandise.def:22
 msgid "stickers"
 msgstr ""
 
-#: ../../english/events/merchandise.def:22
+#: ../../english/events/merchandise.def:25
 msgid "mugs"
 msgstr ""
 
-#: ../../english/events/merchandise.def:25
+#: ../../english/events/merchandise.def:28
 msgid "other clothing"
 msgstr ""
 
-#: ../../english/events/merchandise.def:28
+#: ../../english/events/merchandise.def:31
 msgid "polo shirts"
 msgstr ""
 
-#: ../../english/events/merchandise.def:31
+#: ../../english/events/merchandise.def:34
 msgid "frisbees"
 msgstr ""
 
-#: ../../english/events/merchandise.def:34
+#: ../../english/events/merchandise.def:37
 msgid "mouse pads"
 msgstr ""
 
-#: ../../english/events/merchandise.def:37
+#: ../../english/events/merchandise.def:40
 msgid "badges"
 msgstr ""
 
-#: ../../english/events/merchandise.def:40
+#: ../../english/events/merchandise.def:43
 msgid "basketball goals"
 msgstr ""
 
-#: ../../english/events/merchandise.def:44
+#: ../../english/events/merchandise.def:47
 msgid "earrings"
 msgstr ""
 
-#: ../../english/events/merchandise.def:47
+#: ../../english/events/merchandise.def:50
 msgid "suitcases"
 msgstr ""
 
-#: ../../english/events/merchandise.def:50
+#: ../../english/events/merchandise.def:53
 msgid "umbrellas"
 msgstr ""
 
-#: ../../english/events/merchandise.def:53
+#: ../../english/events/merchandise.def:56
 msgid "pillowcases"
 msgstr ""
 
-#: ../../english/events/merchandise.def:56
+#: ../../english/events/merchandise.def:59
 msgid "keychains"
 msgstr ""
 
-#: ../../english/events/merchandise.def:59
+#: ../../english/events/merchandise.def:62
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/events/merchandise.def:62
+#: ../../english/events/merchandise.def:65
 msgid "USB-Sticks"
 msgstr ""
 
-#: ../../english/events/merchandise.def:77
+#: ../../english/events/merchandise.def:80
 msgid "lanyards"
 msgstr ""
 
-#: ../../english/events/merchandise.def:80
+#: ../../english/events/merchandise.def:83
 msgid "others"
 msgstr ""
 
-#: ../../english/events/merchandise.def:101
+#: ../../english/events/merchandise.def:90
+msgid "Available languages:"
+msgstr ""
+
+#: ../../english/events/merchandise.def:107
+msgid "International delivery:"
+msgstr ""
+
+#: ../../english/events/merchandise.def:118
+msgid "within Europe"
+msgstr ""
+
+#: ../../english/events/merchandise.def:122
+msgid "Original country:"
+msgstr ""
+
+#: ../../english/events/merchandise.def:187
 msgid "Donates money to Debian"
 msgstr ""
 
-#: ../../english/events/merchandise.def:106
+#: ../../english/events/merchandise.def:192
 msgid "Money is used to organize local free software events"
 msgstr ""
 
diff --git a/english/po/partners.pot b/english/po/partners.pot
index 3044e2e81da..b77e273438e 100644
--- a/english/po/partners.pot
+++ b/english/po/partners.pot
@@ -31,223 +31,231 @@ msgstr ""
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:42
+#: ../../english/partners/partners.def:40
+msgid "<a href=\"https://amperecomputing.com\">Ampere®</a> provides hardware for arm64/armhf/armel build daemons and other Debian services (current Ampere hardware donations are listed in the <a href=\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+msgstr ""
+
+#: ../../english/partners/partners.def:43
+msgid "Ampere is designing the future of hyperscale cloud and edge computing with the world’s first cloud native processor. Built for the cloud with a modern 64-bit Arm server-based architecture, Ampere gives customers the freedom to accelerate the delivery of all cloud computing applications. With industry-leading cloud performance, power efficiency and scalability, Ampere processors are tailored for the continued growth of cloud and edge computing."
+msgstr ""
+
+#: ../../english/partners/partners.def:51
 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:46
+#: ../../english/partners/partners.def:55
 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:54
+#: ../../english/partners/partners.def:63
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:57
+#: ../../english/partners/partners.def:66
 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."
 msgstr ""
 
-#: ../../english/partners/partners.def:64
+#: ../../english/partners/partners.def:73
 msgid "<a href=\"https://www.credativ.com/\">credativ</a> is an independent consulting and services company and since 1999 been offering comprehensive services and technical support for the implementation and operation of open source software in business applications. Our <q>Open Source Support Center</q> is always available, 365 days a year, around the clock. "
 msgstr ""
 
-#: ../../english/partners/partners.def:67
+#: ../../english/partners/partners.def:76
 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:73
+#: ../../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. "
 msgstr ""
 
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:86
 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:83
+#: ../../english/partners/partners.def:92
 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:86
+#: ../../english/partners/partners.def:95
 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:93
+#: ../../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>."
 msgstr ""
 
-#: ../../english/partners/partners.def:96
+#: ../../english/partners/partners.def:105
 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:103
+#: ../../english/partners/partners.def:112
 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:106
+#: ../../english/partners/partners.def:115
 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:113
+#: ../../english/partners/partners.def:122
 msgid "<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's continuous integration infrastructure within Google Cloud Platform."
 msgstr ""
 
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:125
 msgid "Google is one of the largest technology companies in the world, providing a wide range of Internet-related services and products as online advertising technologies, search, cloud computing, software, and hardware."
 msgstr ""
 
-#: ../../english/partners/partners.def:123
+#: ../../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)."
 msgstr ""
 
-#: ../../english/partners/partners.def:126
+#: ../../english/partners/partners.def:135
 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:134
+#: ../../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."
 msgstr ""
 
-#: ../../english/partners/partners.def:137
+#: ../../english/partners/partners.def:146
 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:143
+#: ../../english/partners/partners.def:152
 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:146
+#: ../../english/partners/partners.def:155
 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:152
+#: ../../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."
 msgstr ""
 
-#: ../../english/partners/partners.def:156
+#: ../../english/partners/partners.def:165
 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:164
+#: ../../english/partners/partners.def:173
 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:168
+#: ../../english/partners/partners.def:177
 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:175
+#: ../../english/partners/partners.def:184
 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:179
+#: ../../english/partners/partners.def:188
 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:185
+#: ../../english/partners/partners.def:194
 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:188
+#: ../../english/partners/partners.def:197
 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:195
+#: ../../english/partners/partners.def:204
 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:198
+#: ../../english/partners/partners.def:207
 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:204
+#: ../../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:207
+#: ../../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:210
+#: ../../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:216
+#: ../../english/partners/partners.def:225
 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:219
+#: ../../english/partners/partners.def:228
 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:225
+#: ../../english/partners/partners.def:234
 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:228
+#: ../../english/partners/partners.def:237
 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:236
+#: ../../english/partners/partners.def:245
 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:239
+#: ../../english/partners/partners.def:248
 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:249
+#: ../../english/partners/partners.def:258
 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:252
+#: ../../english/partners/partners.def:261
 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:259
+#: ../../english/partners/partners.def:268
 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:262
+#: ../../english/partners/partners.def:271
 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:269
+#: ../../english/partners/partners.def:278
 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:273
+#: ../../english/partners/partners.def:282
 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:280
+#: ../../english/partners/partners.def:289
 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:287
+#: ../../english/partners/partners.def:296
 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:294
+#: ../../english/partners/partners.def:303
 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:297
+#: ../../english/partners/partners.def:306
 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:305
+#: ../../english/partners/partners.def:314
 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:308
+#: ../../english/partners/partners.def:317
 msgid "It hosts a Debian development machine, <a href=\"https://db.debian.org/machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:316
+#: ../../english/partners/partners.def:325
 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:319
+#: ../../english/partners/partners.def:328
 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/english/po/security.pot b/english/po/security.pot
index 3e9ec993c0c..528dcaa3bb1 100644
--- a/english/po/security.pot
+++ b/english/po/security.pot
@@ -21,31 +21,31 @@ msgstr ""
 msgid "MD5 checksums of the listed files are available in the <a href=\"<get-var url />\">revised advisory</a>."
 msgstr ""
 
-#: ../../english/template/debian/security.wml:42
+#: ../../english/template/debian/security.wml:44
 msgid "Debian Security Advisory"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:47
+#: ../../english/template/debian/security.wml:49
 msgid "Date Reported"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:50
+#: ../../english/template/debian/security.wml:52
 msgid "Affected Packages"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:72
+#: ../../english/template/debian/security.wml:74
 msgid "Vulnerable"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:75
+#: ../../english/template/debian/security.wml:77
 msgid "Security database references"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:78
+#: ../../english/template/debian/security.wml:80
 msgid "More information"
 msgstr ""
 
-#: ../../english/template/debian/security.wml:84
+#: ../../english/template/debian/security.wml:86
 msgid "Fixed in"
 msgstr ""
 
diff --git a/english/po/stats.pot b/english/po/stats.pot
index 07c9efd434a..04bd190ff14 100644
--- a/english/po/stats.pot
+++ b/english/po/stats.pot
@@ -3,225 +3,225 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../stattrans.pl:278
-#: ../../stattrans.pl:494
+#: ../../stattrans.pl:282
+#: ../../stattrans.pl:498
 msgid "Wrong translation version"
 msgstr ""
 
-#: ../../stattrans.pl:280
+#: ../../stattrans.pl:284
 msgid "This translation is too out of date"
 msgstr ""
 
-#: ../../stattrans.pl:282
+#: ../../stattrans.pl:286
 msgid "The original is newer than this translation"
 msgstr ""
 
-#: ../../stattrans.pl:286
-#: ../../stattrans.pl:494
+#: ../../stattrans.pl:290
+#: ../../stattrans.pl:498
 msgid "The original no longer exists"
 msgstr ""
 
-#: ../../stattrans.pl:470
+#: ../../stattrans.pl:474
 msgid "hits"
 msgstr ""
 
-#: ../../stattrans.pl:470
+#: ../../stattrans.pl:474
 msgid "hit count N/A"
 msgstr ""
 
-#: ../../stattrans.pl:488
-#: ../../stattrans.pl:489
+#: ../../stattrans.pl:492
+#: ../../stattrans.pl:493
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:599
-#: ../../stattrans.pl:739
+#: ../../stattrans.pl:603
+#: ../../stattrans.pl:743
 msgid "Created with <transstatslink>"
 msgstr ""
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:608
 msgid "Translation summary for"
 msgstr ""
 
-#: ../../stattrans.pl:607
+#: ../../stattrans.pl:611
 msgid "Translated"
 msgstr ""
 
-#: ../../stattrans.pl:607
-#: ../../stattrans.pl:687
-#: ../../stattrans.pl:761
-#: ../../stattrans.pl:807
-#: ../../stattrans.pl:850
+#: ../../stattrans.pl:611
+#: ../../stattrans.pl:691
+#: ../../stattrans.pl:765
+#: ../../stattrans.pl:811
+#: ../../stattrans.pl:854
 msgid "Up to date"
 msgstr ""
 
-#: ../../stattrans.pl:607
-#: ../../stattrans.pl:762
-#: ../../stattrans.pl:808
+#: ../../stattrans.pl:611
+#: ../../stattrans.pl:766
+#: ../../stattrans.pl:812
 msgid "Outdated"
 msgstr ""
 
-#: ../../stattrans.pl:607
-#: ../../stattrans.pl:763
-#: ../../stattrans.pl:809
-#: ../../stattrans.pl:852
+#: ../../stattrans.pl:611
+#: ../../stattrans.pl:767
+#: ../../stattrans.pl:813
+#: ../../stattrans.pl:856
 msgid "Not translated"
 msgstr ""
 
-#: ../../stattrans.pl:608
-#: ../../stattrans.pl:609
-#: ../../stattrans.pl:610
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:612
+#: ../../stattrans.pl:613
+#: ../../stattrans.pl:614
+#: ../../stattrans.pl:615
 msgid "files"
 msgstr ""
 
-#: ../../stattrans.pl:614
-#: ../../stattrans.pl:615
-#: ../../stattrans.pl:616
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:618
+#: ../../stattrans.pl:619
+#: ../../stattrans.pl:620
+#: ../../stattrans.pl:621
 msgid "bytes"
 msgstr ""
 
-#: ../../stattrans.pl:624
+#: ../../stattrans.pl:628
 msgid "Note: the lists of pages are sorted by popularity. Hover over the page name to see the number of hits."
 msgstr ""
 
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:634
 msgid "Outdated translations"
 msgstr ""
 
-#: ../../stattrans.pl:632
-#: ../../stattrans.pl:686
+#: ../../stattrans.pl:636
+#: ../../stattrans.pl:690
 msgid "File"
 msgstr ""
 
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:638
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:640
 msgid "Comment"
 msgstr ""
 
-#: ../../stattrans.pl:637
+#: ../../stattrans.pl:641
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:638
+#: ../../stattrans.pl:642
 msgid "Git command line"
 msgstr ""
 
-#: ../../stattrans.pl:640
+#: ../../stattrans.pl:644
 msgid "Log"
 msgstr ""
 
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:645
 msgid "Translation"
 msgstr ""
 
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:646
 msgid "Maintainer"
 msgstr ""
 
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:648
 msgid "Status"
 msgstr ""
 
-#: ../../stattrans.pl:645
+#: ../../stattrans.pl:649
 msgid "Translator"
 msgstr ""
 
-#: ../../stattrans.pl:646
+#: ../../stattrans.pl:650
 msgid "Date"
 msgstr ""
 
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:657
 msgid "General pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:654
+#: ../../stattrans.pl:658
 msgid "Untranslated general pages"
 msgstr ""
 
-#: ../../stattrans.pl:659
+#: ../../stattrans.pl:663
 msgid "News items not translated"
 msgstr ""
 
-#: ../../stattrans.pl:660
+#: ../../stattrans.pl:664
 msgid "Untranslated news items"
 msgstr ""
 
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:669
 msgid "Consultant/user pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:670
 msgid "Untranslated consultant/user pages"
 msgstr ""
 
-#: ../../stattrans.pl:671
+#: ../../stattrans.pl:675
 msgid "International pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:672
+#: ../../stattrans.pl:676
 msgid "Untranslated international pages"
 msgstr ""
 
-#: ../../stattrans.pl:677
+#: ../../stattrans.pl:681
 msgid "Translated pages (up-to-date)"
 msgstr ""
 
-#: ../../stattrans.pl:684
-#: ../../stattrans.pl:834
+#: ../../stattrans.pl:688
+#: ../../stattrans.pl:838
 msgid "Translated templates (PO files)"
 msgstr ""
 
-#: ../../stattrans.pl:685
-#: ../../stattrans.pl:837
+#: ../../stattrans.pl:689
+#: ../../stattrans.pl:841
 msgid "PO Translation Statistics"
 msgstr ""
 
-#: ../../stattrans.pl:688
-#: ../../stattrans.pl:851
+#: ../../stattrans.pl:692
+#: ../../stattrans.pl:855
 msgid "Fuzzy"
 msgstr ""
 
-#: ../../stattrans.pl:689
+#: ../../stattrans.pl:693
 msgid "Untranslated"
 msgstr ""
 
-#: ../../stattrans.pl:690
+#: ../../stattrans.pl:694
 msgid "Total"
 msgstr ""
 
-#: ../../stattrans.pl:707
+#: ../../stattrans.pl:711
 msgid "Total:"
 msgstr ""
 
-#: ../../stattrans.pl:741
+#: ../../stattrans.pl:745
 msgid "Translated web pages"
 msgstr ""
 
-#: ../../stattrans.pl:744
+#: ../../stattrans.pl:748
 msgid "Translation Statistics by Page Count"
 msgstr ""
 
-#: ../../stattrans.pl:759
-#: ../../stattrans.pl:805
-#: ../../stattrans.pl:849
+#: ../../stattrans.pl:763
+#: ../../stattrans.pl:809
+#: ../../stattrans.pl:853
 msgid "Language"
 msgstr ""
 
-#: ../../stattrans.pl:760
-#: ../../stattrans.pl:806
+#: ../../stattrans.pl:764
+#: ../../stattrans.pl:810
 msgid "Translations"
 msgstr ""
 
-#: ../../stattrans.pl:787
+#: ../../stattrans.pl:791
 msgid "Translated web pages (by size)"
 msgstr ""
 
-#: ../../stattrans.pl:790
+#: ../../stattrans.pl:794
 msgid "Translation Statistics by Page Size"
 msgstr ""
 
diff --git a/english/po/templates.pot b/english/po/templates.pot
index 0ab48864e5a..3bcf7c2f8bf 100644
--- a/english/po/templates.pot
+++ b/english/po/templates.pot
@@ -180,31 +180,31 @@ msgstr ""
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:91
 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:109
+#: ../../english/template/debian/footer.wml:94
 msgid "Last Modified"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:112
+#: ../../english/template/debian/footer.wml:97
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:115
+#: ../../english/template/debian/footer.wml:100
 msgid "Copyright"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:118
+#: ../../english/template/debian/footer.wml:103
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:121
+#: ../../english/template/debian/footer.wml:106
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:124
+#: ../../english/template/debian/footer.wml:109
 msgid "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of Software in the Public Interest, Inc."
 msgstr ""