Add pronoun support to organization and update CT delegation with it

1 files changed, 120 insertions, 98 deletions

diff --git a/english/po/organization.pot b/english/po/organization.pot
index 97cb26bd678..c0d99094201 100644
--- a/english/po/organization.pot
+++ b/english/po/organization.pot
@@ -13,373 +13,395 @@ 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=\"hehim\"/>he/him"
 msgstr ""
 
+#: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:26
+msgid "<void id=\"sheher\"/>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=\"theythem\"/>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: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:105
 msgid "Distribution"
 msgstr ""
 
-#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:237
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:240
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:244
 msgid "Publicity team"
 msgstr ""
 
-#: ../../english/intro/organization.data:70
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:315
 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:343
 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:100
 msgid "Secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:108
 msgid "Development Projects"
 msgstr ""
 
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:109
 msgid "FTP Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:111
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:117
 msgid "FTP Assistants"
 msgstr ""
 
-#: ../../english/intro/organization.data:116
+#: ../../english/intro/organization.data:123
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:127
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:129
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:133
 msgid "Release Management"
 msgstr ""
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:135
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:144
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:142
+#: ../../english/intro/organization.data:145
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:146
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:147
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
-msgid "CD Images"
+#: ../../english/intro/organization.data:149
+msgid "CD/DVD/USB Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:151
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:156
+#: ../../english/intro/organization.data:158
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:160
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:162
+#: ../../english/intro/organization.data:164
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:166
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:171
+#: ../../english/intro/organization.data:173
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:189
+#: ../../english/intro/organization.data:191
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:194
+#: ../../english/intro/organization.data:196
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:198
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:228
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:230
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:231
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:232
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:247
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:249
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:261
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:266
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:269
+#: ../../english/intro/organization.data:271
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:277
-msgid "Anti-harassment"
+#: ../../english/intro/organization.data:279
+msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:286
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:293
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:300
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:301
+#: ../../english/intro/organization.data:305
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:317
+#: ../../english/intro/organization.data:321
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:319
+#: ../../english/intro/organization.data:323
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:325
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:323
+#: ../../english/intro/organization.data:327
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:325
+#: ../../english/intro/organization.data:329
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:330
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:333
 msgid "OASIS: Organization\n      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:336
 msgid "OVAL: Open Vulnerability\n      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:339
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:342
+#: ../../english/intro/organization.data:346
 msgid "User support"
 msgstr ""
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:413
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:418
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:427
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:433
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:437
 msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:438
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:442
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:453
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:458
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:461
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:459
+#: ../../english/intro/organization.data:464
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:465
 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:475
 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:476
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:477
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:478
+#: ../../english/intro/organization.data:484
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:485
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:487
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:488
+#: ../../english/intro/organization.data:494
 msgid "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:491
+#: ../../english/intro/organization.data:497
 msgid "Salsa administrators"
 msgstr ""