Update language templates

2 files changed, 45 insertions, 121 deletions

diff --git a/english/po/organization.pot b/english/po/organization.pot
index f5ab07f05e9..cb978a7a42a 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:239
+#: ../../english/intro/organization.data:209
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:212
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:216
 msgid "Publicity team"
 msgstr ""
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:319
+#: ../../english/intro/organization.data:289
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:317
 msgid "Support and Infrastructure"
 msgstr ""
 
@@ -229,187 +229,163 @@ msgstr ""
 msgid "Work-Needing and Prospective Packages list"
 msgstr ""
 
-#: ../../english/intro/organization.data:200
-msgid "Ports"
-msgstr ""
-
-#: ../../english/intro/organization.data:230
-msgid "Special Configurations"
-msgstr ""
-
-#: ../../english/intro/organization.data:232
-msgid "Laptops"
-msgstr ""
-
-#: ../../english/intro/organization.data:233
-msgid "Firewalls"
-msgstr ""
-
-#: ../../english/intro/organization.data:234
-msgid "Embedded systems"
-msgstr ""
-
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:219
 msgid "Press Contact"
 msgstr ""
 
-#: ../../english/intro/organization.data:251
+#: ../../english/intro/organization.data:221
 msgid "Web Pages"
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:233
 msgid "Planet Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:268
+#: ../../english/intro/organization.data:238
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:243
 msgid "Debian Women Project"
 msgstr ""
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:251
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:260
 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:292
+#: ../../english/intro/organization.data:262
 msgid "Events"
 msgstr ""
 
-#: ../../english/intro/organization.data:299
+#: ../../english/intro/organization.data:269
 msgid "DebConf Committee"
 msgstr ""
 
-#: ../../english/intro/organization.data:306
+#: ../../english/intro/organization.data:276
 msgid "Partner Program"
 msgstr ""
 
-#: ../../english/intro/organization.data:310
+#: ../../english/intro/organization.data:280
 msgid "Hardware Donations Coordination"
 msgstr ""
 
-#: ../../english/intro/organization.data:325
+#: ../../english/intro/organization.data:295
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:327
+#: ../../english/intro/organization.data:297
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:299
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:331
+#: ../../english/intro/organization.data:301
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:333
+#: ../../english/intro/organization.data:303
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:304
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:337
+#: ../../english/intro/organization.data:307
 msgid "OASIS: Organization\n      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:310
 msgid "OVAL: Open Vulnerability\n      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:313
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:350
-msgid "User support"
-msgstr ""
-
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:320
 msgid "Bug Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:325
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr ""
 
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:334
 msgid "New Members Front Desk"
 msgstr ""
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:340
 msgid "Debian Account Managers"
 msgstr ""
 
-#: ../../english/intro/organization.data:441
+#: ../../english/intro/organization.data:344
 msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:442
+#: ../../english/intro/organization.data:345
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr ""
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:349
 msgid "Security Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:457
+#: ../../english/intro/organization.data:360
 msgid "Consultants Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:365
 msgid "CD Vendors Page"
 msgstr ""
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:368
 msgid "Policy"
 msgstr ""
 
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:371
 msgid "System Administration"
 msgstr ""
 
-#: ../../english/intro/organization.data:469
+#: ../../english/intro/organization.data:372
 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:479
+#: ../../english/intro/organization.data:382
 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:480
+#: ../../english/intro/organization.data:383
 msgid "LDAP Developer Directory Administrator"
 msgstr ""
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:384
 msgid "Mirrors"
 msgstr ""
 
-#: ../../english/intro/organization.data:488
+#: ../../english/intro/organization.data:391
 msgid "DNS Maintainer"
 msgstr ""
 
-#: ../../english/intro/organization.data:489
+#: ../../english/intro/organization.data:392
 msgid "Package Tracking System"
 msgstr ""
 
-#: ../../english/intro/organization.data:491
+#: ../../english/intro/organization.data:394
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:498
+#: ../../english/intro/organization.data:401
 msgid "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:502
+#: ../../english/intro/organization.data:405
 msgid "Salsa administrators"
 msgstr ""
 
diff --git a/english/po/others.pot b/english/po/others.pot
index 4853a7c4c67..f69ed8e91aa 100644
--- a/english/po/others.pot
+++ b/english/po/others.pot
@@ -3,14 +3,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/banners/index.tags:7
-msgid "Download"
-msgstr ""
-
-#: ../../english/banners/index.tags:11
-msgid "Old banner ads"
-msgstr ""
-
 #: ../../english/devel/debian-installer/ports-status.defs:10
 msgid "Working"
 msgstr ""
@@ -211,50 +203,6 @@ msgstr ""
 msgid "Money is used to organize local free software events"
 msgstr ""
 
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:18
-msgid "??"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
-msgstr ""
-
 #: ../../english/devel/join/nm-steps.inc:7
 msgid "New Members Corner"
 msgstr ""