Update language templates

4 files changed, 135 insertions, 131 deletions

diff --git a/english/po/countries.pot b/english/po/countries.pot
index 03a63df5bb6..3864bde51f0 100644
--- a/english/po/countries.pot
+++ b/english/po/countries.pot
@@ -252,178 +252,182 @@ msgid "Morocco"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:297
-msgid "Moldova"
+msgid "Monaco"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:300
-msgid "Montenegro"
+msgid "Moldova"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:303
-msgid "Madagascar"
+msgid "Montenegro"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:306
-msgid "Macedonia, Republic of"
+msgid "Madagascar"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:309
-msgid "Mongolia"
+msgid "Macedonia, Republic of"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:312
-msgid "Malta"
+msgid "Mongolia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:315
-msgid "Mexico"
+msgid "Malta"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:318
-msgid "Malaysia"
+msgid "Mexico"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:321
-msgid "New Caledonia"
+msgid "Malaysia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:324
-msgid "Nicaragua"
+msgid "New Caledonia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:327
-msgid "Netherlands"
+msgid "Nicaragua"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:330
-msgid "Norway"
+msgid "Netherlands"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:333
-msgid "New Zealand"
+msgid "Norway"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:336
-msgid "Panama"
+msgid "New Zealand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:339
-msgid "Peru"
+msgid "Panama"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:342
-msgid "French Polynesia"
+msgid "Peru"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:345
-msgid "Philippines"
+msgid "French Polynesia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:348
-msgid "Pakistan"
+msgid "Philippines"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:351
-msgid "Poland"
+msgid "Pakistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:354
-msgid "Portugal"
+msgid "Poland"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:357
-msgid "Réunion"
+msgid "Portugal"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:360
-msgid "Romania"
+msgid "Réunion"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:363
-msgid "Serbia"
+msgid "Romania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:366
-msgid "Russia"
+msgid "Serbia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:369
-msgid "Saudi Arabia"
+msgid "Russia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:372
-msgid "Sweden"
+msgid "Saudi Arabia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:375
-msgid "Singapore"
+msgid "Sweden"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:378
-msgid "Slovenia"
+msgid "Singapore"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:381
-msgid "Slovakia"
+msgid "Slovenia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:384
-msgid "El Salvador"
+msgid "Slovakia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:387
-msgid "Thailand"
+msgid "El Salvador"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:390
-msgid "Tajikistan"
+msgid "Thailand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:393
-msgid "Tunisia"
+msgid "Tajikistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:396
-msgid "Turkey"
+msgid "Tunisia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:399
-msgid "Taiwan"
+msgid "Turkey"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:402
-msgid "Ukraine"
+msgid "Taiwan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:405
-msgid "United States"
+msgid "Ukraine"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:408
-msgid "Uruguay"
+msgid "United States"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:411
-msgid "Uzbekistan"
+msgid "Uruguay"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:414
-msgid "Venezuela"
+msgid "Uzbekistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:417
-msgid "Vietnam"
+msgid "Venezuela"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:420
-msgid "Vanuatu"
+msgid "Vietnam"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:423
-msgid "South Africa"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:426
+msgid "South Africa"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:429
 msgid "Zimbabwe"
 msgstr ""
 
diff --git a/english/po/organization.pot b/english/po/organization.pot
index 4192300df53..0ce896a0532 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:203
+#: ../../english/intro/organization.data:204
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:206
+#: ../../english/intro/organization.data:207
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:212
 msgid "Publicity team"
 msgstr ""
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:284
+#: ../../english/intro/organization.data:279
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:312
+#: ../../english/intro/organization.data:305
 msgid "Support and Infrastructure"
 msgstr ""
 
@@ -177,207 +177,207 @@ msgstr ""
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:148
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:149
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:150
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:151
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:152
+#: ../../english/intro/organization.data:153
 msgid "CD/DVD/USB Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:154
+#: ../../english/intro/organization.data:155
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:161
+#: ../../english/intro/organization.data:162
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:163
+#: ../../english/intro/organization.data:164
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:168
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:169
+#: ../../english/intro/organization.data:170
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:177
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:193
+#: ../../english/intro/organization.data:194
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:199
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:215
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:217
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:225
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:230
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:235
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:250
 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:257
+#: ../../english/intro/organization.data:252
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:259
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:266
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:275
+#: ../../english/intro/organization.data:270
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:285
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:287
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:288
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:291
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:299
+#: ../../english/intro/organization.data:292
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:295
 msgid "OASIS: Organization\n      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:298
 msgid "OVAL: Open Vulnerability\n      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:301
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:308
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:313
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:321
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:327
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:331
 msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:332
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:336
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:355
+#: ../../english/intro/organization.data:347
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:358
+#: ../../english/intro/organization.data:350
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:351
 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:369
+#: ../../english/intro/organization.data:361
 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:370
+#: ../../english/intro/organization.data:362
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:363
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:369
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:370
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:372
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:379
 msgid "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:383
 msgid "Salsa administrators"
 msgstr ""
 
diff --git a/english/po/partners.pot b/english/po/partners.pot
index 237b5333be6..1edc6d476e8 100644
--- a/english/po/partners.pot
+++ b/english/po/partners.pot
@@ -167,103 +167,103 @@ msgstr ""
 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: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: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:223
+#: ../../english/partners/partners.def:213
 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:226
+#: ../../english/partners/partners.def:216
 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:232
+#: ../../english/partners/partners.def:222
 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:235
+#: ../../english/partners/partners.def:225
 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:243
+#: ../../english/partners/partners.def:233
 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:246
+#: ../../english/partners/partners.def:236
 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:256
+#: ../../english/partners/partners.def:246
 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:259
+#: ../../english/partners/partners.def:249
 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:266
+#: ../../english/partners/partners.def:256
 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:269
+#: ../../english/partners/partners.def:259
 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:276
+#: ../../english/partners/partners.def:266
 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:280
+#: ../../english/partners/partners.def:270
 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:287
+#: ../../english/partners/partners.def:277
 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:294
+#: ../../english/partners/partners.def:284
 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:301
+#: ../../english/partners/partners.def:291
 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:304
+#: ../../english/partners/partners.def:294
 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:312
+#: ../../english/partners/partners.def:302
 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:315
+#: ../../english/partners/partners.def:305
 msgid "It hosts a Debian development machine, <a href=\"https://db.debian.org/machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:323
+#: ../../english/partners/partners.def:313
 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:326
+#: ../../english/partners/partners.def:316
 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
+#: ../../english/partners/partners.def:325
+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:328
+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:336
 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
+#: ../../english/partners/partners.def:339
 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
+#: ../../english/partners/partners.def:342
 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 ""
 
diff --git a/english/po/templates.pot b/english/po/templates.pot
index 0360b8f6e25..096873043d0 100644
--- a/english/po/templates.pot
+++ b/english/po/templates.pot
@@ -402,7 +402,7 @@ msgid "Debian-Edu project"
 msgstr ""
 
 #: ../../english/template/debian/links.tags.wml:137
-msgid "Alioth &ndash; Debian GForge"
+msgid "Salsa &ndash; Debian Gitlab"
 msgstr ""
 
 #: ../../english/template/debian/links.tags.wml:140