Update language templates (pot files)

4 files changed, 180 insertions, 132 deletions

diff --git a/english/po/doc.pot b/english/po/doc.pot
index 64287f3593c..fc96fea4a6a 100644
--- a/english/po/doc.pot
+++ b/english/po/doc.pot
@@ -61,47 +61,50 @@ msgid "plain text"
 msgstr ""
 
 #: ../../english/doc/manuals.defs:159
-#: ../../english/doc/manuals.defs:183
+#: ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
 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:169
-#: ../../english/doc/manuals.defs:177
-#: ../../english/doc/manuals.defs:185
+#: ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179
+#: ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
 msgid "Web interface: "
 msgstr ""
 
 #: ../../english/doc/manuals.defs:162
-#: ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178
-#: ../../english/doc/manuals.defs:186
+#: ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
 msgid "VCS interface: "
 msgstr ""
 
-#: ../../english/doc/manuals.defs:167
+#: ../../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:175
+#: ../../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:193
+#: ../../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:198
+#: ../../english/doc/manuals.defs:208
 msgid "CVS via web"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:202
-#: ../../english/doc/manuals.defs:206
+#: ../../english/doc/manuals.defs:212
+#: ../../english/doc/manuals.defs:216
 msgid "Debian package"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:211
-#: ../../english/doc/manuals.defs:215
+#: ../../english/doc/manuals.defs:221
+#: ../../english/doc/manuals.defs:225
 msgid "Debian package (archived)"
 msgstr ""
 
diff --git a/english/po/organization.pot b/english/po/organization.pot
index aaa62e3e03d..3de4c9cd709 100644
--- a/english/po/organization.pot
+++ b/english/po/organization.pot
@@ -60,314 +60,359 @@ msgstr ""
 msgid "secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:59
-#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:77
 msgid "Officers"
 msgstr ""
 
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:101
 msgid "Distribution"
 msgstr ""
 
-#: ../../english/intro/organization.data:61
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:237
 msgid "Communication and Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:240
 msgid "Data Protection team"
 msgstr ""
 
-#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:244
 msgid "Publicity team"
 msgstr ""
 
-#: ../../english/intro/organization.data:66
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
 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:68
+#: ../../english/intro/organization.data:73
 msgid "Debian Pure Blends"
 msgstr ""
 
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:80
 msgid "Leader"
 msgstr ""
 
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:82
 msgid "Technical Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:91
+#: ../../english/intro/organization.data:96
 msgid "Secretary"
 msgstr ""
 
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
 msgid "Development Projects"
 msgstr ""
 
-#: ../../english/intro/organization.data:100
+#: ../../english/intro/organization.data:105
 msgid "FTP Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:107
 msgid "FTP Masters"
 msgstr ""
 
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:113
 msgid "FTP Assistants"
 msgstr ""
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:118
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:117
+#: ../../english/intro/organization.data:122
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:119
+#: ../../english/intro/organization.data:124
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:123
-msgid "Individual Packages"
-msgstr ""
-
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:128
 msgid "Release Management"
 msgstr ""
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:130
 msgid "Release Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:143
 msgid "Quality Assurance"
 msgstr ""
 
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:144
 msgid "Installation System Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:145
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:146
 msgid "Release Notes"
 msgstr ""
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
 msgid "CD Images"
 msgstr ""
 
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:150
 msgid "Production"
 msgstr ""
 
-#: ../../english/intro/organization.data:153
+#: ../../english/intro/organization.data:158
 msgid "Testing"
 msgstr ""
 
-#: ../../english/intro/organization.data:155
+#: ../../english/intro/organization.data:160
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:164
 msgid "Autobuilding infrastructure"
 msgstr ""
 
-#: ../../english/intro/organization.data:161
+#: ../../english/intro/organization.data:166
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:168
+#: ../../english/intro/organization.data:173
 msgid "Buildd administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:186
+#: ../../english/intro/organization.data:191
 msgid "Documentation"
 msgstr ""
 
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:196
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:193
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:194
+#: ../../english/intro/organization.data:198
 msgid "Ports"
 msgstr ""
 
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:228
 msgid "Special Configurations"
 msgstr ""
 
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:230
 msgid "Laptops"
 msgstr ""
 
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:231
 msgid "Firewalls"
 msgstr ""
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:232
 msgid "Embedded systems"
 msgstr ""
 
-#: ../../english/intro/organization.data:243
+#: ../../english/intro/organization.data:247
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:249
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:259
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:260
+#: ../../english/intro/organization.data:264
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:265
+#: ../../english/intro/organization.data:269
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:277
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:278
+#: ../../english/intro/organization.data:282
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:289
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:296
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:297
+#: ../../english/intro/organization.data:301
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:310
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid "OASIS: Organization\n      for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid "OVAL: Open Vulnerability\n      Assessme Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
 msgid "User support"
 msgstr ""
 
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:409
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:414
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:422
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:428
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:432
 msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:433
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:437
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:448
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:453
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:456
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:459
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:460
 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:438
+#: ../../english/intro/organization.data:469
 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:439
+#: ../../english/intro/organization.data:470
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:440
+#: ../../english/intro/organization.data:471
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:478
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:479
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:481
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:487
 msgid "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:459
+#: ../../english/intro/organization.data:490
 msgid "Salsa administrators"
 msgstr ""
 
-#: ../../english/intro/organization.data:470
+#: ../../english/intro/organization.data:501
 msgid "Debian for children from 1 to 99"
 msgstr ""
 
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:504
 msgid "Debian for medical practice and research"
 msgstr ""
 
-#: ../../english/intro/organization.data:476
+#: ../../english/intro/organization.data:507
 msgid "Debian for education"
 msgstr ""
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:511
 msgid "Debian in legal offices"
 msgstr ""
 
-#: ../../english/intro/organization.data:485
+#: ../../english/intro/organization.data:515
 msgid "Debian for people with disabilities"
 msgstr ""
 
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:519
 msgid "Debian for science and related research"
 msgstr ""
 
-#: ../../english/intro/organization.data:492
+#: ../../english/intro/organization.data:522
 msgid "Debian for astronomy"
 msgstr ""
 
diff --git a/english/po/others.pot b/english/po/others.pot
index c538e22ec43..ce0bacb9c3f 100644
--- a/english/po/others.pot
+++ b/english/po/others.pot
@@ -106,91 +106,91 @@ msgstr ""
 msgid "[Debian] (mini button)"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:10
+#: ../../english/events/merchandise.def:10
 msgid "Products"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:13
+#: ../../english/events/merchandise.def:13
 msgid "T-shirts"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:16
+#: ../../english/events/merchandise.def:16
 msgid "hats"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:19
+#: ../../english/events/merchandise.def:19
 msgid "stickers"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:22
+#: ../../english/events/merchandise.def:22
 msgid "mugs"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:25
+#: ../../english/events/merchandise.def:25
 msgid "other clothing"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:28
+#: ../../english/events/merchandise.def:28
 msgid "polo shirts"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:31
+#: ../../english/events/merchandise.def:31
 msgid "frisbees"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:34
+#: ../../english/events/merchandise.def:34
 msgid "mouse pads"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:37
+#: ../../english/events/merchandise.def:37
 msgid "badges"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:40
+#: ../../english/events/merchandise.def:40
 msgid "basketball goals"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:44
+#: ../../english/events/merchandise.def:44
 msgid "earrings"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:47
+#: ../../english/events/merchandise.def:47
 msgid "suitcases"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:50
+#: ../../english/events/merchandise.def:50
 msgid "umbrellas"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:53
+#: ../../english/events/merchandise.def:53
 msgid "pillowcases"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:56
+#: ../../english/events/merchandise.def:56
 msgid "keychains"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:59
+#: ../../english/events/merchandise.def:59
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:62
+#: ../../english/events/merchandise.def:62
 msgid "USB-Sticks"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:77
+#: ../../english/events/merchandise.def:77
 msgid "lanyards"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:80
+#: ../../english/events/merchandise.def:80
 msgid "others"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:101
+#: ../../english/events/merchandise.def:101
 msgid "Donates money to Debian"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:106
+#: ../../english/events/merchandise.def:106
 msgid "Money is used to organize local free software events"
 msgstr ""
 
diff --git a/english/po/templates.pot b/english/po/templates.pot
index b11232be695..d33a5a1707e 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:107
+#: ../../english/template/debian/footer.wml:106
 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:110
+#: ../../english/template/debian/footer.wml:109
 msgid "Last Modified"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
 msgid "Copyright"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:125
+#: ../../english/template/debian/footer.wml:124
 msgid "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of Software in the Public Interest, Inc."
 msgstr ""