From b0de170035c3ac15bb1924dc98351aad241908d4 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 30 Aug 2012 17:41:56 +0000
Subject: [PATCH] - Fix translated entities by Properly overriding l10n.ent in
the catalog chain
Approved by: doceng (implicit)
---
de_DE.ISO8859-1/share/sgml/catalog.xml | 2 ++
es_ES.ISO8859-1/share/sgml/catalog.xml | 2 ++
fr_FR.ISO8859-1/share/sgml/catalog.xml | 5 ++---
hu_HU.ISO8859-2/share/sgml/catalog.xml | 2 ++
it_IT.ISO8859-15/share/sgml/catalog.xml | 2 ++
ja_JP.eucJP/share/sgml/catalog.xml | 2 ++
nl_NL.ISO8859-1/share/sgml/catalog.xml | 2 ++
ru_RU.KOI8-R/share/sgml/catalog.xml | 2 ++
zh_CN.GB2312/share/sgml/catalog.xml | 2 ++
zh_TW.Big5/share/sgml/catalog.xml | 2 ++
10 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/de_DE.ISO8859-1/share/sgml/catalog.xml b/de_DE.ISO8859-1/share/sgml/catalog.xml
index b9d18cae20..ad4dd6139e 100644
--- a/de_DE.ISO8859-1/share/sgml/catalog.xml
+++ b/de_DE.ISO8859-1/share/sgml/catalog.xml
@@ -13,6 +13,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/es_ES.ISO8859-1/share/sgml/catalog.xml b/es_ES.ISO8859-1/share/sgml/catalog.xml
index 54b1e5909c..3553c62fbc 100644
--- a/es_ES.ISO8859-1/share/sgml/catalog.xml
+++ b/es_ES.ISO8859-1/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/fr_FR.ISO8859-1/share/sgml/catalog.xml b/fr_FR.ISO8859-1/share/sgml/catalog.xml
index bc8cf4f74a..3553c62fbc 100644
--- a/fr_FR.ISO8859-1/share/sgml/catalog.xml
+++ b/fr_FR.ISO8859-1/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
@@ -19,7 +21,4 @@
<public
publicId="-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
uri="header.l10n.ent" />
- <public
- publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- uri="l10n.ent" />
</catalog>
diff --git a/hu_HU.ISO8859-2/share/sgml/catalog.xml b/hu_HU.ISO8859-2/share/sgml/catalog.xml
index 54b1e5909c..3553c62fbc 100644
--- a/hu_HU.ISO8859-2/share/sgml/catalog.xml
+++ b/hu_HU.ISO8859-2/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/it_IT.ISO8859-15/share/sgml/catalog.xml b/it_IT.ISO8859-15/share/sgml/catalog.xml
index 54b1e5909c..3553c62fbc 100644
--- a/it_IT.ISO8859-15/share/sgml/catalog.xml
+++ b/it_IT.ISO8859-15/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/ja_JP.eucJP/share/sgml/catalog.xml b/ja_JP.eucJP/share/sgml/catalog.xml
index 54b1e5909c..3553c62fbc 100644
--- a/ja_JP.eucJP/share/sgml/catalog.xml
+++ b/ja_JP.eucJP/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/nl_NL.ISO8859-1/share/sgml/catalog.xml b/nl_NL.ISO8859-1/share/sgml/catalog.xml
index a2f8724123..55828910f7 100644
--- a/nl_NL.ISO8859-1/share/sgml/catalog.xml
+++ b/nl_NL.ISO8859-1/share/sgml/catalog.xml
@@ -11,6 +11,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/ru_RU.KOI8-R/share/sgml/catalog.xml b/ru_RU.KOI8-R/share/sgml/catalog.xml
index 54b1e5909c..3553c62fbc 100644
--- a/ru_RU.KOI8-R/share/sgml/catalog.xml
+++ b/ru_RU.KOI8-R/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/zh_CN.GB2312/share/sgml/catalog.xml b/zh_CN.GB2312/share/sgml/catalog.xml
index 54b1e5909c..3553c62fbc 100644
--- a/zh_CN.GB2312/share/sgml/catalog.xml
+++ b/zh_CN.GB2312/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />
diff --git a/zh_TW.Big5/share/sgml/catalog.xml b/zh_TW.Big5/share/sgml/catalog.xml
index 72ea96d059..91a24be917 100644
--- a/zh_TW.Big5/share/sgml/catalog.xml
+++ b/zh_TW.Big5/share/sgml/catalog.xml
@@ -10,6 +10,8 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
uri="release.l10n.ent" />