- Define l10n.ent as an entity in localized directories and make them be

  picked up via XML catalog in freebsd50.ent or xhtml10-freebsd.dtd,
  not entities.ent.  The L10N entities always come first to be able to
  override everything.

- Define   as   in EUC-JP encoding.  This is a workaround to
  prevent an invalid character in EUC-JP caused by converting 0xa0 in
  UTF-8 (EUC-JP does not allow 0xa0) in XSLT processing.  Theoretically
  it should be   still in the final XML output.

- Make XML catalog resolution consistent for l10n.ent.  This should be
  revisited for the others later.

2 files changed, 3 insertions, 6 deletions

diff --git a/mn_MN.UTF-8/share/xml/catalog.xml b/mn_MN.UTF-8/share/xml/catalog.xml
index 0e9826192d..83ed165e98 100644
--- a/mn_MN.UTF-8/share/xml/catalog.xml
+++ b/mn_MN.UTF-8/share/xml/catalog.xml
@@ -11,12 +11,12 @@
               rewritePrefix="../../"/>
 
   <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
+  <public
         publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
         uri="entities.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//MN"
         uri="translators.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>
diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent
index d27a37e871..8ac136c07b 100644
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@@ -21,9 +21,6 @@
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
 	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;