new security gettext domain

CVS version numbers

Makefile.common: 1.76 -> 1.77 
english/po/Makefile: 1.35 -> 1.36 
english/po/security.pot: INITIAL -> 1.1 
english/po/templates.pot: 1.11 -> 1.12 
english/security/Makefile: 1.45 -> 1.46 
english/security/crossreferences.wml: 1.5 -> 1.6 
english/security/dsa.rdf.in: 1.5 -> 1.6 
english/security/make-ref-table.pl: 1.15 -> 1.16 
english/template/debian/security.wml: 1.111 -> 1.112 
english/template/debian/security_tags.wml: 1.44 -> 1.45(DEAD) 
english/template/debian/securityreferences.wml: 1.2 -> 1.3

11 files changed, 159 insertions, 234 deletions

diff --git a/Makefile.common b/Makefile.common
index 8786b9663d2..d530c7b4ca3 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -182,10 +182,9 @@ $(TEMPLDIR)/past_event.wml: $(TEMPLDIR)/events_common.wml \
   $(TEMPLDIR)/basic.wml $(TEMPLDIR)/languages.wml
 $(TEMPLDIR)/recent_list.wml: $(TEMPLDIR)/ctime.wml $(TEMPLDIR)/common_tags.wml
 $(TEMPLDIR)/release.wml: $(TEMPLDIR)/languages.wml
-$(TEMPLDIR)/security_tags.wml: $(TEMPLDIR)/common_tags.wml
 $(TEMPLDIR)/security.wml: $(TEMPLDIR)/common_translation.wml \
   $(TEMPLDIR)/basic.wml $(TEMPLDIR)/fixes_link.wml $(TEMPLDIR)/languages.wml \
-  $(TEMPLDIR)/ctime.wml $(TEMPLDIR)/security_tags.wml
+  $(TEMPLDIR)/ctime.wml $(TEMPLDIR)/common_tags.wml
 $(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/languages.wml
 $(TEMPLDIR)/todoitem.wml: $(TEMPLDIR)/common_tags.wml
 $(TEMPLDIR)/url.wml: $(TEMPLDIR)/common_tags.wml
diff --git a/english/po/Makefile b/english/po/Makefile
index e08cf49c396..b959c708881 100644
--- a/english/po/Makefile
+++ b/english/po/Makefile
@@ -9,7 +9,7 @@ include $(WMLBASE)/Make.lang
 
 LOCALEROOT = $(WMLBASE)/../locale
 
-DOMAINS = templates bugs countries date doc l10n langs organization ports search vendors others
+DOMAINS = templates bugs countries date doc l10n langs organization ports search security vendors others
 
 bugs_FILES      = $(ENGLISHDIR)/Bugs/pkgreport-opts.inc
 countries_FILES = $(TEMPLDIR)/countries.wml
@@ -24,6 +24,10 @@ ports_FILES     = $(ENGLISHDIR)/ports/menu.defs \
   $(wildcard $(ENGLISHDIR)/ports/*/menu.inc) \
   $(ENGLISHDIR)/misc/laptops/menu.inc
 search_FILES    = $(ENGLISHDIR)/searchtmpl/search.def
+security_FILES  = $(TEMPLDIR)/security.wml \
+  $(TEMPLDIR)/securityreferences.wml \
+  $(ENGLISHDIR)/security/dsa.rdf.in \
+  $(ENGLISHDIR)/security/make-ref-table.pl
 vendors_FILES   = $(ENGLISHDIR)/CD/vendors/vendors.CD.def
 others_FILES    = $(ENGLISHDIR)/News/press/press.tags \
   $(ENGLISHDIR)/MailingLists/mklist.tags $(ENGLISHDIR)/banners/index.tags \
@@ -35,7 +39,7 @@ others_FILES    = $(ENGLISHDIR)/News/press/press.tags \
 templates_FILES = $(addprefix $(TEMPLDIR)/, \
   cdimage.wml common_tags.wml common_translation.wml consultant.wml \
   ddp.wml events_common.wml fixes_link.wml footer.wml languages.wml \
-  links.tags.wml mirrors.wml news.wml recent_list.wml security_tags.wml \
+  links.tags.wml mirrors.wml news.wml recent_list.wml \
   todoitem.wml translation-check.wml url.wml votebar.wml \
   weeklynews/footer.wml) $(ENGLISHDIR)/devel/website/tc.data
 
@@ -51,6 +55,7 @@ SOURCEFILES = \
   $(organization_FILES)         \
   $(ports_FILES)                \
   $(search_FILES)               \
+  $(security_FILES)             \
   $(vendors_FILES)              \
   $(others_FILES)               \
   $(templates_FILES)
@@ -91,6 +96,9 @@ $(ENGLISHDIR)/po/ports.pot: # $(ports_FILES)
 $(ENGLISHDIR)/po/search.pot: # $(search_FILES)
 	$(ENGLISHDIR)/po/wmlxgettext.pl search $(search_FILES) > $@
 
+$(ENGLISHDIR)/po/security.pot: # $(security_FILES)
+	$(ENGLISHDIR)/po/wmlxgettext.pl security $(security_FILES) > $@
+
 $(ENGLISHDIR)/po/vendors.pot: # $(vendors_FILES)
 	$(ENGLISHDIR)/po/wmlxgettext.pl vendors $(vendors_FILES) > $@
 
diff --git a/english/po/security.pot b/english/po/security.pot
new file mode 100644
index 00000000000..98626de96fb
--- /dev/null
+++ b/english/po/security.pot
@@ -0,0 +1,90 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../english/template/debian/security.wml:11
+msgid "Source:"
+msgstr ""
+
+#: ../../english/template/debian/security.wml:15
+msgid "Architecture-independent component:"
+msgstr ""
+
+#. don't translate `<get-var url />'
+#: ../../english/template/debian/security.wml:22
+msgid "MD5 checksums of the listed files are available in the <a href=\"<get-var url />\">original advisory</a>."
+msgstr ""
+
+#: ../../english/template/debian/security.wml:34
+msgid "Debian Security Advisory"
+msgstr ""
+
+#: ../../english/template/debian/security.wml:39
+msgid "Date Reported"
+msgstr ""
+
+#: ../../english/template/debian/security.wml:41
+msgid "Affected Packages"
+msgstr ""
+
+#: ../../english/template/debian/security.wml:43
+msgid "Vulnerable"
+msgstr ""
+
+#: ../../english/template/debian/security.wml:48
+msgid "Security database references"
+msgstr ""
+
+#: ../../english/template/debian/security.wml:50
+msgid "More information"
+msgstr ""
+
+#: ../../english/template/debian/security.wml:54
+msgid "Fixed in"
+msgstr ""
+
+#: ../../english/template/debian/securityreferences.wml:14
+msgid "BugTraq ID"
+msgstr ""
+
+#: ../../english/template/debian/securityreferences.wml:59
+msgid "In the Bugtraq database (at SecurityFocus):"
+msgstr ""
+
+#: ../../english/template/debian/securityreferences.wml:62
+msgid "In Mitre's CVE dictionary:"
+msgstr ""
+
+#: ../../english/template/debian/securityreferences.wml:65
+msgid "CERT's vulnerabilities, advisories and incident notes:"
+msgstr ""
+
+#: ../../english/template/debian/securityreferences.wml:68
+msgid "No other external database security references currently available."
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:15
+msgid "Debian Security"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:18
+msgid "Debian Security Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:61
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:64
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:68
+msgid "CERT alerts"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:72
+msgid "CERT vulnerabilities"
+msgstr ""
+
diff --git a/english/po/templates.pot b/english/po/templates.pot
index 7b604eb746b..b502be8b632 100644
--- a/english/po/templates.pot
+++ b/english/po/templates.pot
@@ -459,104 +459,6 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: ../../english/template/debian/security_tags.wml:4
-msgid "Debian Security"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:8
-msgid "Debian Security Advisory"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:12
-msgid "Debian Security Advisories"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:16
-msgid "Date Reported"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:19
-msgid "Affected Packages"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:22
-msgid "Vulnerable"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:25
-#: ../../english/devel/website/tc.data:12
-#: ../../english/devel/website/tc.data:14
-#: ../../english/devel/website/tc.data:15
-msgid "More information"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:28
-msgid "Fixed in"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:31
-msgid "Source:"
-msgstr ""
-
-#: ../../english/template/debian/security_tags.wml:34
-msgid "Architecture-independent component:"
-msgstr ""
-
-#. don't translate `<get-var url />'
-#: ../../english/template/debian/security_tags.wml:40
-msgid "MD5 checksums of the listed files are available in the <a href=\"<get-var url />\">original advisory</a>."
-msgstr ""
-
-#. Cross reference in DSA documents
-#: ../../english/template/debian/security_tags.wml:46
-msgid "No other external database security references currently available."
-msgstr ""
-
-#. Cross reference in DSA documents
-#: ../../english/template/debian/security_tags.wml:51
-msgid "CERT's vulnerabilities, advisories and incident notes:"
-msgstr ""
-
-#. Cross reference in DSA documents
-#: ../../english/template/debian/security_tags.wml:56
-msgid "In the Bugtraq database (at SecurityFocus):"
-msgstr ""
-
-#. ID prefix string
-#: ../../english/template/debian/security_tags.wml:61
-msgid "BugTraq ID"
-msgstr ""
-
-#. Cross reference in DSA documents
-#: ../../english/template/debian/security_tags.wml:66
-msgid "In Mitre's CVE dictionary:"
-msgstr ""
-
-#. Header for cross reference list in DSA documents
-#: ../../english/template/debian/security_tags.wml:71
-msgid "Security database references"
-msgstr ""
-
-#. Cross reference table header
-#: ../../english/template/debian/security_tags.wml:76
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#. Cross reference table header
-#: ../../english/template/debian/security_tags.wml:81
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#. Cross reference table header
-#: ../../english/template/debian/security_tags.wml:86
-msgid "CERT alerts"
-msgstr ""
-
-#. Cross reference table header
-#: ../../english/template/debian/security_tags.wml:91
-msgid "CERT vulnerabilities"
-msgstr ""
-
 #: ../../english/template/debian/todoitem.wml:4
 msgid "More information:"
 msgstr ""
@@ -659,3 +561,9 @@ msgstr ""
 msgid "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
 msgstr ""
 
+#: ../../english/devel/website/tc.data:12
+#: ../../english/devel/website/tc.data:14
+#: ../../english/devel/website/tc.data:15
+msgid "More information"
+msgstr ""
+
diff --git a/english/security/Makefile b/english/security/Makefile
index f7d5ab3f5bb..7df9a27e1d4 100644
--- a/english/security/Makefile
+++ b/english/security/Makefile
@@ -46,7 +46,7 @@ $(DSARDF): $(ENGLISHDIR)/security/dsa.rdf.in \
   $(wildcard $(CUR_YEAR)/dsa-*.wml) \
   $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.wml) \
   $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.data) \
-  $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/security_tags.wml $(GETTEXTDEP)
+  $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP)
 ifeq "$(LANGUAGE)" "zh"
 	$(shell echo $(WML) | perl -pe 's,:.zh-(..)\.html,:dsa.zh-$$1.rdf,g') \
           $(shell egrep '^-D (CUR_|CHAR)' ../.wmlrc) \
@@ -70,7 +70,7 @@ $(DSALONGRDF): $(ENGLISHDIR)/security/dsa-long.rdf.in \
   $(wildcard $(CUR_YEAR)/dsa-*.wml) \
   $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.wml) \
   $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.data) \
-  $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/security_tags.wml $(GETTEXTDEP)
+  $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP)
 ifeq "$(LANGUAGE)" "zh"
 	$(shell echo $(WML) | perl -pe 's,:.zh-(..)\.html,:dsa-long.zh-$$1.rdf,g') \
           $(shell egrep '^-D (CUR_|CHAR)' ../.wmlrc) \
diff --git a/english/security/crossreferences.wml b/english/security/crossreferences.wml
index f7d867d24f1..8cbc233fe3d 100644
--- a/english/security/crossreferences.wml
+++ b/english/security/crossreferences.wml
@@ -1,6 +1,5 @@
 #use wml::debian::template title="Security Cross References" GEN_TIME="yes" NOHEADER="indeed"
 #use wml::debian::securityreferences
-#use wml::debian::security_tags
 
 <H1>Cross References of Debian Security Advisories</H1>
 <P>The data below shows cross references of Debian Security Advisories
diff --git a/english/security/dsa.rdf.in b/english/security/dsa.rdf.in
index 0b0d70675af..5bb3613571d 100644
--- a/english/security/dsa.rdf.in
+++ b/english/security/dsa.rdf.in
@@ -1,5 +1,6 @@
 #use wml::debian::recent_list
-#use wml::debian::security_tags
+
+<bind-gettext-domain domain="security" />
 
 <suck><?xml version="1.0" encoding="$(CHARSET)"?>
 <?xml-stylesheet href="dsa-rdf.css" type="text/css"?>
@@ -11,10 +12,10 @@
 >
 
 <channel rdf:about="http://www.debian.org/security/dsa.rdf">
-  <title><debian_security></title>
+  <title><gettext domain="security">Debian Security</gettext></title>
   <link>http://security.debian.org/</link>
   <description>
-<debian_security_advisories>
+<gettext domain="security">Debian Security Advisories</gettext>
   </description>
   <items>
     <rdf:Seq>
diff --git a/english/security/make-ref-table.pl b/english/security/make-ref-table.pl
index 7219954ebc4..9db0216b329 100755
--- a/english/security/make-ref-table.pl
+++ b/english/security/make-ref-table.pl
@@ -58,18 +58,18 @@ if (defined ($opt_a)) {
 parsedirs (".", "data", 2);
 
 $reference{mitre}{url}="http://cve.mitre.org/cve/refs/refmap/source-DEBIAN.html";
-$reference{mitre}{name}="<cveheader>";
+$reference{mitre}{name}='<gettext domain="security">Mitre CVE dictionary</gettext>';
 $reference{mitre}{perlre}="(CVE|CAN)";
 
-$reference{bid}{name}="<bugtraqheader>";
+$reference{bid}{name}='<gettext domain="security">Securityfocus Bugtraq database</gettext>';
 $reference{bid}{url}="http://online.securityfocus.com/bid";
 $reference{bid}{perlre}="BID";
 
-$reference{cert}{name}="<certalertheader>";
+$reference{cert}{name}='<gettext domain="security">CERT alerts</gettext>';
 $reference{cert}{url}="http://www.cert.org/advisories/";
 $reference{cert}{perlre}="CA-";
 
-$reference{certvu}{name}="<certvulnheader>";
+$reference{certvu}{name}='<gettext domain="security">CERT vulnerabilities</gettext>';
 $reference{certvu}{url}="http://www.kb.cert.org/vuls";
 $reference{certvu}{perlre}="VU";
 
diff --git a/english/template/debian/security.wml b/english/template/debian/security.wml
index cd8f279c70c..de177073244 100644
--- a/english/template/debian/security.wml
+++ b/english/template/debian/security.wml
@@ -1,21 +1,27 @@
-
-# The translatable tags are in security_tags.wml
-
+#use wml::debian::common_tags
 #use wml::debian::common_translation
 #use wml::debian::fixes_link
 #use wml::debian::languages
 #use wml::debian::ctime
-#use wml::debian::security_tags
 #use wml::debian::securityreferences
 
-<define-tag vulnerability>
-	<ifeq "<isvulnerable/>" "yes" "<font color="#FF0000"><yes></font>">
-	<ifeq "<isvulnerable/>" "no" "<font color="#00FF00"><no></font>">
+<bind-gettext-domain domain="security" />
+
+<define-tag source whitespace=delete>
+  <gettext domain="security">Source:</gettext>
 </define-tag>
 
-<define-tag secreferences>
-  <:= security_references("<secrefs>") :>
-</define-tag secreferences>
+<define-tag arch-indep whitespace=delete>
+  <gettext domain="security">Architecture-independent component:</gettext>
+</define-tag>
+
+<define-tag md5sums whitespace=delete>
+  <preserve url />
+  <set-var url=%0 />
+# don't translate `<get-var url />'
+  <gettext domain="security">MD5 checksums of the listed files are available in the <a href="<get-var url />">original advisory</a>.</gettext>
+  <restore url />
+</define-tag>
 
 <define-tag fileurl whitespace=delete>
 <a href="%0">%0</a><br />
@@ -25,26 +31,27 @@
 
 #use wml::debian::basic title="<security/> -- <pagetitle/>"
 
-<h1><debian_security_advisory/></h1>
+<h1><gettext domain="security">Debian Security Advisory</gettext></h1>
 
 <h2><pagetitle/> -- <description/></h2>
 
 <dl compact>
-<dt><datereported/>:</dt>
+<dt><gettext domain="security">Date Reported</gettext>:</dt>
 	<dd><:= newsdate('<report_date/>') :></dd>
-<dt><affectedpackages/>:</dt>
+<dt><gettext domain="security">Affected Packages</gettext>:</dt>
 	<dd><packages/></dd>
-<dt><vulnerable/>:</dt>
-	<dd><vulnerability/></dd>
-# This might be done with a ifneq "" tag too if people 
-# do not like the <nosecref> here (jfs)
-<dt><secdbinfo/>:</dt>
-	<dd><secreferences></dd>
-<dt><formoreinfo/>:</dt>
+<dt><gettext domain="security">Vulnerable</gettext>:</dt>
+	<dd>
+	<ifeq "<isvulnerable/>" "yes" "<font color="#FF0000"><yes></font>">
+	<ifeq "<isvulnerable/>" "no" "<font color="#00FF00"><no></font>">
+	</dd>
+<dt><gettext domain="security">Security database references</gettext>:</dt>
+	<dd><:= security_references("<secrefs>") :></dd>
+<dt><gettext domain="security">More information</gettext>:</dt>
 	<dd><moreinfo/></dd>
 #<ifneq "{#securitybody#}" "" "
 <ifneq "<isvulnerable/>" "no" "
-<dt><fixedin/>:</dt>
+<dt><gettext domain="security">Fixed in</gettext>:</dt>
 	<dd>{#securitybody#}</dd>
 "/>
 </dl>
diff --git a/english/template/debian/security_tags.wml b/english/template/debian/security_tags.wml
deleted file mode 100644
index f763842db0c..00000000000
--- a/english/template/debian/security_tags.wml
+++ /dev/null
@@ -1,92 +0,0 @@
-#use wml::debian::common_tags
-
-<define-tag debian_security whitespace=delete>
-  <gettext>Debian Security</gettext>
-</define-tag>
-
-<define-tag debian_security_advisory whitespace=delete>
-  <gettext>Debian Security Advisory</gettext>
-</define-tag>
-
-<define-tag debian_security_advisories whitespace=delete>
-  <gettext>Debian Security Advisories</gettext>
-</define-tag>
-
-<define-tag datereported whitespace=delete>
-  <gettext>Date Reported</gettext>
-</define-tag>
-<define-tag affectedpackages whitespace=delete>
-  <gettext>Affected Packages</gettext>
-</define-tag>
-<define-tag vulnerable whitespace=delete>
-  <gettext>Vulnerable</gettext>
-</define-tag>
-<define-tag formoreinfo whitespace=delete>
-  <gettext>More information</gettext>
-</define-tag>
-<define-tag fixedin whitespace=delete>
-  <gettext>Fixed in</gettext>
-</define-tag>
-<define-tag source whitespace=delete>
-  <gettext>Source:</gettext>
-</define-tag>
-<define-tag arch-indep whitespace=delete>
-  <gettext>Architecture-independent component:</gettext>
-</define-tag>
-<define-tag md5sums whitespace=delete>
-  <preserve url />
-  <set-var url=%0 />
-# don't translate `<get-var url />'
-  <gettext>MD5 checksums of the listed files are available in the <a href="<get-var url />">original advisory</a>.</gettext>
-  <restore url />
-</define-tag>
-
-<define-tag nosecref whitespace=delete>
-# Cross reference in DSA documents
-  <gettext>No other external database security references currently available.</gettext>
-</define-tag>
-
-<define-tag cert whitespace=delete>
-# Cross reference in DSA documents
-  <gettext>CERT's vulnerabilities, advisories and incident notes:</gettext>
-</define-tag>
-
-<define-tag bugtraq whitespace=delete>
-# Cross reference in DSA documents
-  <gettext>In the Bugtraq database (at SecurityFocus):</gettext>
-</define-tag>
-
-<define-tag bugtraqid whitespace=delete>
-# ID prefix string
-  <gettext>BugTraq ID</gettext>
-</define-tag>
-
-<define-tag cve whitespace=delete>
-# Cross reference in DSA documents
-  <gettext>In Mitre's CVE dictionary:</gettext>
-</define-tag>
-
-<define-tag secdbinfo whitespace=delete>
-# Header for cross reference list in DSA documents
-  <gettext>Security database references</gettext>
-</define-tag>
-
-<define-tag cveheader whitespace=delete>
-# Cross reference table header
-  <gettext>Mitre CVE dictionary</gettext>
-</define-tag>
-
-<define-tag bugtraqheader whitespace=delete>
-# Cross reference table header
-  <gettext>Securityfocus Bugtraq database</gettext>
-</define-tag>
-
-<define-tag certalertheader whitespace=delete>
-# Cross reference table header
-  <gettext>CERT alerts</gettext>
-</define-tag>
-
-<define-tag certvulnheader whitespace=delete>
-# Cross reference table header
-  <gettext>CERT vulnerabilities</gettext>
-</define-tag>
diff --git a/english/template/debian/securityreferences.wml b/english/template/debian/securityreferences.wml
index 4551a4d26de..6683810c2db 100644
--- a/english/template/debian/securityreferences.wml
+++ b/english/template/debian/securityreferences.wml
@@ -10,7 +10,9 @@ sub bid_secref {
 		if ( $ref =~ /BID(\d+)/i ) {
 			my $id = $1;
 			$bid .= ", " if $bid ne "";
-			$bid .= "<a href=\"http://online.securityfocus.com/bid/".$id."\"><bugtraqid> ".$id."</a>"; 
+			$bid .= '<a href="http://online.securityfocus.com/bid/'.$id.'">'
+			       .'<gettext domain="security">BugTraq ID</gettext>'
+			       ." ".$id."</a>"; 
 		}
 	}
 	return $bid;
@@ -54,14 +56,17 @@ sub security_references {
 	$bid = bid_secref($refstr);
 	$cve = cve_secref($refstr);
 	$cert = cert_secref($refstr);
-	$str .= "<bugtraq> $bid.<br>"  if $bid ne "";
-	$str .= "<cve> $cve.<br>"  if $cve ne "";
-	$str .= "<cert> $cert.<br>"  if $cert ne "";
-	$str = "<nosecref>" if $str eq "";
+	$str .= q{<gettext domain="security">In the Bugtraq database (at SecurityFocus):</gettext>}
+	       ." $bid.<br>"
+		if $bid ne "";
+	$str .= q{<gettext domain="security">In Mitre's CVE dictionary:</gettext>}
+	       ." $cve.<br>"
+		if $cve ne "";
+	$str .= q{<gettext domain="security">CERT's vulnerabilities, advisories and incident notes:</gettext>}
+	       ." $cert.<br>"
+		if $cert ne "";
+	$str = q{<gettext domain="security">No other external database security references currently available.</gettext>}
+		if $str eq "";
 	return $str;
 }
 </perl>
-
-<define-tag secreferences>
-  <:= security_references("<secrefs>") :>
-</define-tag secreferences>