Update language templates

5 files changed, 176 insertions, 173 deletions

diff --git a/english/po/countries.pot b/english/po/countries.pot
index 603b689d48f..e948456d938 100644
--- a/english/po/countries.pot
+++ b/english/po/countries.pot
@@ -212,210 +212,214 @@ msgid "Kenya"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:267
-msgid "Korea"
+msgid "Kyrgyzstan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:270
-msgid "Kuwait"
+msgid "Korea"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:273
-msgid "Kazakhstan"
+msgid "Kuwait"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:276
-msgid "Sri Lanka"
+msgid "Kazakhstan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:279
-msgid "Lithuania"
+msgid "Sri Lanka"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:282
-msgid "Luxembourg"
+msgid "Lithuania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:285
-msgid "Latvia"
+msgid "Luxembourg"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:288
-msgid "Morocco"
+msgid "Latvia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:291
-msgid "Moldova"
+msgid "Morocco"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:294
-msgid "Montenegro"
+msgid "Moldova"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:297
-msgid "Madagascar"
+msgid "Montenegro"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:300
-msgid "Macedonia, Republic of"
+msgid "Madagascar"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:303
-msgid "Mongolia"
+msgid "Macedonia, Republic of"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:306
-msgid "Malta"
+msgid "Mongolia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:309
-msgid "Mexico"
+msgid "Malta"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:312
-msgid "Malaysia"
+msgid "Mexico"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:315
-msgid "New Caledonia"
+msgid "Malaysia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:318
-msgid "Nicaragua"
+msgid "New Caledonia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:321
-msgid "Netherlands"
+msgid "Nicaragua"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:324
-msgid "Norway"
+msgid "Netherlands"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:327
-msgid "New Zealand"
+msgid "Norway"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:330
-msgid "Panama"
+msgid "New Zealand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:333
-msgid "Peru"
+msgid "Panama"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:336
-msgid "French Polynesia"
+msgid "Peru"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:339
-msgid "Philippines"
+msgid "French Polynesia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:342
-msgid "Pakistan"
+msgid "Philippines"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:345
-msgid "Poland"
+msgid "Pakistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:348
-msgid "Portugal"
+msgid "Poland"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:351
-msgid "Réunion"
+msgid "Portugal"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:354
-msgid "Romania"
+msgid "Réunion"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:357
-msgid "Serbia"
+msgid "Romania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:360
-msgid "Russia"
+msgid "Serbia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:363
-msgid "Saudi Arabia"
+msgid "Russia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:366
-msgid "Sweden"
+msgid "Saudi Arabia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:369
-msgid "Singapore"
+msgid "Sweden"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:372
-msgid "Slovenia"
+msgid "Singapore"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:375
-msgid "Slovakia"
+msgid "Slovenia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:378
-msgid "El Salvador"
+msgid "Slovakia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:381
-msgid "Thailand"
+msgid "El Salvador"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:384
-msgid "Tajikistan"
+msgid "Thailand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:387
-msgid "Tunisia"
+msgid "Tajikistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:390
-msgid "Turkey"
+msgid "Tunisia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:393
-msgid "Taiwan"
+msgid "Turkey"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:396
-msgid "Ukraine"
+msgid "Taiwan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:399
-msgid "United States"
+msgid "Ukraine"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:402
-msgid "Uruguay"
+msgid "United States"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:405
-msgid "Uzbekistan"
+msgid "Uruguay"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:408
-msgid "Venezuela"
+msgid "Uzbekistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:411
-msgid "Vietnam"
+msgid "Venezuela"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:414
-msgid "Vanuatu"
+msgid "Vietnam"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:417
-msgid "South Africa"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:420
+msgid "South Africa"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:423
 msgid "Zimbabwe"
 msgstr ""
 
diff --git a/english/po/organization.pot b/english/po/organization.pot
index 65fc59c05b8..97cb26bd678 100644
--- a/english/po/organization.pot
+++ b/english/po/organization.pot
@@ -69,27 +69,27 @@ msgid "role"
 msgstr ""
 
 #: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
 msgid "Officers"
 msgstr ""
 
 #: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
 msgid "Distribution"
 msgstr ""
 
 #: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
 msgid "Publicity team"
 msgstr ""
 
@@ -103,136 +103,131 @@ msgstr ""
 msgid "Support and Infrastructure"
 msgstr ""
 
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
 msgid "Leader"
 msgstr ""
 
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
 msgid "Technical Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
 msgid "Secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
 msgid "Development Projects"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
 msgid "FTP Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
 msgid "FTP Assistants"
 msgstr ""
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
 msgid "Release Management"
 msgstr ""
 
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
 msgid "CD Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
 msgid "Web Pages"
 msgstr ""
 
@@ -380,39 +375,11 @@ msgstr ""
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
 msgid "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
 msgid "Salsa administrators"
 msgstr ""
 
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr ""
-
diff --git a/english/po/partners.pot b/english/po/partners.pot
index 51eeb148267..3044e2e81da 100644
--- a/english/po/partners.pot
+++ b/english/po/partners.pot
@@ -48,7 +48,7 @@ msgid "conova operates one of the most modern data centers in all of Europe in S
 msgstr ""
 
 #: ../../english/partners/partners.def:64
-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."
+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
diff --git a/english/po/templates.pot b/english/po/templates.pot
index d33a5a1707e..0ab48864e5a 100644
--- a/english/po/templates.pot
+++ b/english/po/templates.pot
@@ -217,6 +217,14 @@ msgstr ""
 msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
 msgstr ""
 
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
 #: ../../english/template/debian/links.tags.wml:4
 msgid "Debian International"
 msgstr ""
diff --git a/english/po/vote.pot b/english/po/vote.pot
index 2f2941ea427..b1ea8988ae7 100644
--- a/english/po/vote.pot
+++ b/english/po/vote.pot
@@ -60,202 +60,226 @@ msgid "Proposal F Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:55
-msgid "Seconds"
+msgid "Proposal G Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:58
-msgid "Proposal A Seconds"
+msgid "Proposal H Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:61
-msgid "Proposal B Seconds"
+msgid "Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:64
-msgid "Proposal C Seconds"
+msgid "Proposal A Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:67
-msgid "Proposal D Seconds"
+msgid "Proposal B Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:70
-msgid "Proposal E Seconds"
+msgid "Proposal C Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:73
-msgid "Proposal F Seconds"
+msgid "Proposal D Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:76
-msgid "Opposition"
+msgid "Proposal E Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:79
-msgid "Text"
+msgid "Proposal F Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:82
-msgid "Proposal A"
+msgid "Proposal G Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:85
-msgid "Proposal B"
+msgid "Proposal H Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:88
-msgid "Proposal C"
+msgid "Opposition"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:91
-msgid "Proposal D"
+msgid "Text"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:94
-msgid "Proposal E"
+msgid "Proposal A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:97
-msgid "Proposal F"
+msgid "Proposal B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:100
-msgid "Choices"
+msgid "Proposal C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Proposer"
+msgid "Proposal D"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Seconds"
+msgid "Proposal E"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Text"
+msgid "Proposal F"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Proposer A"
+msgid "Proposal G"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Seconds A"
+msgid "Proposal H"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Text A"
+msgid "Choices"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Proposer B"
+msgid "Amendment Proposer"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Seconds B"
+msgid "Amendment Seconds"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Text B"
+msgid "Amendment Text"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Proposer C"
+msgid "Amendment Proposer A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Seconds C"
+msgid "Amendment Seconds A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:136
-msgid "Amendment Text C"
+msgid "Amendment Text A"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:139
-msgid "Amendments"
+msgid "Amendment Proposer B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:142
-msgid "Proceedings"
+msgid "Amendment Seconds B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:145
-msgid "Majority Requirement"
+msgid "Amendment Text B"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:148
-msgid "Data and Statistics"
+msgid "Amendment Proposer C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:151
-msgid "Quorum"
+msgid "Amendment Seconds C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:154
-msgid "Minimum Discussion"
+msgid "Amendment Text C"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:157
-msgid "Ballot"
+msgid "Amendments"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:160
-msgid "Forum"
+msgid "Proceedings"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:181
 msgid "Outcome"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
 msgid "In&nbsp;Discussion"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
 msgid "Voting&nbsp;Open"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
 msgid "Decided"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
 msgid "Withdrawn"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
 msgid "Other"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
 msgid "Home&nbsp;Vote&nbsp;Page"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
 msgid "How&nbsp;To"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
 msgid "Vote"
 msgstr ""