Update language templates

3 files changed, 100 insertions, 92 deletions

diff --git a/english/po/cdimage.pot b/english/po/cdimage.pot
index 91ceec330a4..c2cb82c5356 100644
--- a/english/po/cdimage.pot
+++ b/english/po/cdimage.pot
@@ -57,42 +57,38 @@ msgid "<void id=\"dc_torrent\" />Download with Torrent"
 msgstr ""
 
 #: ../../english/template/debian/cdimage.wml:49
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
-msgstr ""
-
-#: ../../english/template/debian/cdimage.wml:52
 msgid "Debian CD team"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:55
+#: ../../english/template/debian/cdimage.wml:52
 msgid "debian_on_cd"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:58
+#: ../../english/template/debian/cdimage.wml:55
 msgid "<void id=\"faq-bottom\" />faq"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:61
+#: ../../english/template/debian/cdimage.wml:58
 msgid "jigdo"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:64
+#: ../../english/template/debian/cdimage.wml:61
 msgid "http_ftp"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:67
+#: ../../english/template/debian/cdimage.wml:64
 msgid "buy"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:70
+#: ../../english/template/debian/cdimage.wml:67
 msgid "net_install"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:73
+#: ../../english/template/debian/cdimage.wml:70
 msgid "<void id=\"misc-bottom\" />misc"
 msgstr ""
 
-#: ../../english/template/debian/cdimage.wml:76
+#: ../../english/template/debian/cdimage.wml:73
 msgid "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</a> for CDs/DVDs:"
 msgstr ""
 
diff --git a/english/po/countries.pot b/english/po/countries.pot
index e948456d938..03a63df5bb6 100644
--- a/english/po/countries.pot
+++ b/english/po/countries.pot
@@ -216,210 +216,214 @@ msgid "Kyrgyzstan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:270
-msgid "Korea"
+msgid "Cambodia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:273
-msgid "Kuwait"
+msgid "Korea"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:276
-msgid "Kazakhstan"
+msgid "Kuwait"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:279
-msgid "Sri Lanka"
+msgid "Kazakhstan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:282
-msgid "Lithuania"
+msgid "Sri Lanka"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:285
-msgid "Luxembourg"
+msgid "Lithuania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:288
-msgid "Latvia"
+msgid "Luxembourg"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:291
-msgid "Morocco"
+msgid "Latvia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:294
-msgid "Moldova"
+msgid "Morocco"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:297
-msgid "Montenegro"
+msgid "Moldova"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:300
-msgid "Madagascar"
+msgid "Montenegro"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:303
-msgid "Macedonia, Republic of"
+msgid "Madagascar"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:306
-msgid "Mongolia"
+msgid "Macedonia, Republic of"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:309
-msgid "Malta"
+msgid "Mongolia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:312
-msgid "Mexico"
+msgid "Malta"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:315
-msgid "Malaysia"
+msgid "Mexico"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:318
-msgid "New Caledonia"
+msgid "Malaysia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:321
-msgid "Nicaragua"
+msgid "New Caledonia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:324
-msgid "Netherlands"
+msgid "Nicaragua"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:327
-msgid "Norway"
+msgid "Netherlands"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:330
-msgid "New Zealand"
+msgid "Norway"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:333
-msgid "Panama"
+msgid "New Zealand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:336
-msgid "Peru"
+msgid "Panama"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:339
-msgid "French Polynesia"
+msgid "Peru"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:342
-msgid "Philippines"
+msgid "French Polynesia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:345
-msgid "Pakistan"
+msgid "Philippines"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:348
-msgid "Poland"
+msgid "Pakistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:351
-msgid "Portugal"
+msgid "Poland"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:354
-msgid "Réunion"
+msgid "Portugal"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:357
-msgid "Romania"
+msgid "Réunion"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:360
-msgid "Serbia"
+msgid "Romania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:363
-msgid "Russia"
+msgid "Serbia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:366
-msgid "Saudi Arabia"
+msgid "Russia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:369
-msgid "Sweden"
+msgid "Saudi Arabia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:372
-msgid "Singapore"
+msgid "Sweden"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:375
-msgid "Slovenia"
+msgid "Singapore"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:378
-msgid "Slovakia"
+msgid "Slovenia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:381
-msgid "El Salvador"
+msgid "Slovakia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:384
-msgid "Thailand"
+msgid "El Salvador"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:387
-msgid "Tajikistan"
+msgid "Thailand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:390
-msgid "Tunisia"
+msgid "Tajikistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:393
-msgid "Turkey"
+msgid "Tunisia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:396
-msgid "Taiwan"
+msgid "Turkey"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:399
-msgid "Ukraine"
+msgid "Taiwan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:402
-msgid "United States"
+msgid "Ukraine"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:405
-msgid "Uruguay"
+msgid "United States"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:408
-msgid "Uzbekistan"
+msgid "Uruguay"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:411
-msgid "Venezuela"
+msgid "Uzbekistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:414
-msgid "Vietnam"
+msgid "Venezuela"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:417
-msgid "Vanuatu"
+msgid "Vietnam"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:420
-msgid "South Africa"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:423
+msgid "South Africa"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:426
 msgid "Zimbabwe"
 msgstr ""
 
diff --git a/english/po/newsevents.pot b/english/po/newsevents.pot
index e424519287e..b3cb14be79c 100644
--- a/english/po/newsevents.pot
+++ b/english/po/newsevents.pot
@@ -142,112 +142,120 @@ msgstr ""
 msgid "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for the Debian community. Topics covered in this issue include:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:56
-#: ../../english/template/debian/projectnews/boilerplates.wml:77
+#: ../../english/template/debian/projectnews/boilerplates.wml:43
+msgid "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for the Debian community."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:49
+msgid "Other topics covered in this issue include:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:69
+#: ../../english/template/debian/projectnews/boilerplates.wml:90
 msgid "According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search interface of the Ultimate Debian Database</a>, the upcoming release, Debian  <q><get-var release /></q>, is currently affected by <get-var testing /> Release-Critical bugs. Ignoring bugs which are easily solved or on the way to being solved, roughly speaking, about <get-var tobefixed /> Release-Critical bugs remain to be solved for the release to happen."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:57
+#: ../../english/template/debian/projectnews/boilerplates.wml:70
 msgid "There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:78
+#: ../../english/template/debian/projectnews/boilerplates.wml:91
 msgid "There are also <a href=\"<get-var url />\">more detailed statistics</a> as well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:102
+#: ../../english/template/debian/projectnews/boilerplates.wml:115
 msgid "<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which need your help</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:114
+#: ../../english/template/debian/projectnews/boilerplates.wml:127
 msgid "Please help us create this newsletter. We still need more volunteer writers to watch the Debian community and report about what is going on. Please see the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute\">contributing page</a> to find out how to help. We're looking forward to receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:175
+#: ../../english/template/debian/projectnews/boilerplates.wml:188
 msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a>) for announcements."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:176
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
 msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a> or <a href=\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-stable /></q>, the oldstable distribution) for announcements."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:185
+#: ../../english/template/debian/projectnews/boilerplates.wml:198
 msgid "Debian's Stable Release Team released an update announcement for the package: "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:187
 #: ../../english/template/debian/projectnews/boilerplates.wml:200
 #: ../../english/template/debian/projectnews/boilerplates.wml:213
-#: ../../english/template/debian/projectnews/boilerplates.wml:344
-#: ../../english/template/debian/projectnews/boilerplates.wml:358
+#: ../../english/template/debian/projectnews/boilerplates.wml:226
+#: ../../english/template/debian/projectnews/boilerplates.wml:357
+#: ../../english/template/debian/projectnews/boilerplates.wml:371
 msgid ", "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:188
 #: ../../english/template/debian/projectnews/boilerplates.wml:201
 #: ../../english/template/debian/projectnews/boilerplates.wml:214
-#: ../../english/template/debian/projectnews/boilerplates.wml:345
-#: ../../english/template/debian/projectnews/boilerplates.wml:359
+#: ../../english/template/debian/projectnews/boilerplates.wml:227
+#: ../../english/template/debian/projectnews/boilerplates.wml:358
+#: ../../english/template/debian/projectnews/boilerplates.wml:372
 msgid " and "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:189
 #: ../../english/template/debian/projectnews/boilerplates.wml:202
 #: ../../english/template/debian/projectnews/boilerplates.wml:215
+#: ../../english/template/debian/projectnews/boilerplates.wml:228
 msgid ". "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:189
 #: ../../english/template/debian/projectnews/boilerplates.wml:202
 #: ../../english/template/debian/projectnews/boilerplates.wml:215
+#: ../../english/template/debian/projectnews/boilerplates.wml:228
 msgid "Please read them carefully and take the proper measures."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:198
+#: ../../english/template/debian/projectnews/boilerplates.wml:211
 msgid "Debian's Backports Team released advisories for these packages: "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:211
+#: ../../english/template/debian/projectnews/boilerplates.wml:224
 msgid "Debian's Security Team recently released advisories for these packages (among others): "
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:240
+#: ../../english/template/debian/projectnews/boilerplates.wml:253
 msgid "<get-var num-newpkg /> packages were added to the unstable Debian archive recently."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:242
+#: ../../english/template/debian/projectnews/boilerplates.wml:255
 msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:269
+#: ../../english/template/debian/projectnews/boilerplates.wml:282
 msgid "There are several upcoming Debian-related events:"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:275
+#: ../../english/template/debian/projectnews/boilerplates.wml:288
 msgid "You can find more information about Debian-related events and talks on the <a href=\"<get-var events-section />\">events section</a> of the Debian web site, or subscribe to one of our events mailing lists for different regions: <a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:300
+#: ../../english/template/debian/projectnews/boilerplates.wml:313
 msgid "Do you want to organise a Debian booth or a Debian install party? Are you aware of other upcoming Debian-related events? Have you delivered a Debian talk that you want to link on our <a href=\"<get-var events-talks />\">talks page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian Events Team</a>."
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:322
+#: ../../english/template/debian/projectnews/boilerplates.wml:335
 msgid "<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />\">accepted</a> as Debian Developers"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:329
+#: ../../english/template/debian/projectnews/boilerplates.wml:342
 msgid "<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />\">accepted</a> as Debian Maintainers"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:336
+#: ../../english/template/debian/projectnews/boilerplates.wml:349
 msgid "<get-var uploader-num /> people have <a href=\"<get-var uploader-url />\">started to maintain packages</a>"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:381
+#: ../../english/template/debian/projectnews/boilerplates.wml:394
 msgid "<get-var eval-newcontributors-text-list /> since the previous issue of the Debian Project News. Please welcome <get-var eval-newcontributors-name-list /> into our project!"
 msgstr ""
 
-#: ../../english/template/debian/projectnews/boilerplates.wml:394
+#: ../../english/template/debian/projectnews/boilerplates.wml:407
 msgid "The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-news />\">miscellaneous news for developers</a> has been released and covers the following topics:"
 msgstr ""