- 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.

da_DK.ISO8859-1/share/xml/catalog.xml

@@ -10,6 +10,8 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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//DK"

da_DK.ISO8859-1/share/xml/entities.ent

@@ -7,9 +7,6 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
 	"translators.ent">
 %translators;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
 	"mailing-lists.ent">
 %mailing-lists;

de_DE.ISO8859-1/share/xml/catalog.xml

@@ -13,15 +13,15 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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//DE"
         uri="translators.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

de_DE.ISO8859-1/share/xml/entities.ent

@@ -25,9 +25,6 @@
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
 	"nonexistent">
 %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;

el_GR.ISO8859-7/share/xml/catalog.xml

@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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" />

el_GR.ISO8859-7/share/xml/entities.ent

@@ -13,9 +13,6 @@
 
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
 	"translators.ent">
 %translators;

en_US.ISO8859-1/share/xml/catalog.xml

@@ -14,6 +14,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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" />

en_US.ISO8859-1/share/xml/entities.ent

@@ -1,10 +1,7 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
-	"../../../share/xml/freebsd.ent">
+	"nonexistent">
 %freebsd;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"teams.ent">
@@ -16,8 +13,8 @@
 	"newsgroups.ent">
 %newsgroups;
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
-	"../../../share/xml/trademarks.ent">
+	"nonexistent">
 %trademarks;
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
-	"../../../share/xml/urls.ent">
+	"nonexistent">
 %urls;

es_ES.ISO8859-1/share/xml/catalog.xml

@@ -10,12 +10,11 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

es_ES.ISO8859-1/share/xml/entities.ent

@@ -2,9 +2,6 @@
 	$FreeBSD$
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;

fr_FR.ISO8859-1/share/xml/catalog.xml

@@ -10,11 +10,11 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

fr_FR.ISO8859-1/share/xml/entities.ent

@@ -2,9 +2,6 @@
   Original revision: 1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
 	"translators.ent">
 %translators;

hu_HU.ISO8859-2/share/xml/catalog.xml

@@ -10,11 +10,11 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

hu_HU.ISO8859-2/share/xml/entities.ent

@@ -5,9 +5,6 @@
      %SRCID%	1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
 	"freebsd.ent">
 %freebsd;

it_IT.ISO8859-15/share/xml/catalog.xml

@@ -10,11 +10,11 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

it_IT.ISO8859-15/share/xml/entities.ent

@@ -4,9 +4,6 @@
       $FreeBSD$
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;

ja_JP.eucJP/share/xml/catalog.xml

@@ -10,11 +10,11 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

ja_JP.eucJP/share/xml/entities.ent

@@ -1,8 +1,5 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;

ja_JP.eucJP/share/xml/l10n.ent

@@ -5,6 +5,8 @@
      $FreeBSD$
 -->
 
+<!ENTITY nbsp "&#x20;">
+
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "ñ°ìÈÇ">
 <!ENTITY docnavi.split-html  "ʬ³äÈÇ">

mn_MN.UTF-8/share/xml/catalog.xml

@@ -10,13 +10,13 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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>

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;

nl_NL.ISO8859-1/share/xml/catalog.xml

@@ -11,11 +11,11 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

nl_NL.ISO8859-1/share/xml/entities.ent

@@ -27,6 +27,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;

pl_PL.ISO8859-2/share/xml/catalog.xml

@@ -10,10 +10,10 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>

pl_PL.ISO8859-2/share/xml/entities.ent

@@ -5,9 +5,6 @@
      Original revision: 1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;

pt_BR.ISO8859-1/share/xml/catalog.xml

@@ -10,13 +10,13 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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//PT"
         uri="translators.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>

pt_BR.ISO8859-1/share/xml/entities.ent

@@ -10,9 +10,6 @@
 <!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
 	"words.ent">
 %words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
 	"mailing-lists.ent">
 %mailing-lists;

ru_RU.KOI8-R/share/xml/catalog.xml

@@ -10,11 +10,11 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               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 FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
         uri="release.l10n.ent" />

ru_RU.KOI8-R/share/xml/entities.ent

@@ -22,9 +22,6 @@
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
 	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
 	"urls.ent">
 %urls-ru;

share/mk/doc.xml.mk

@@ -111,7 +111,7 @@ ${XML_MIRRORS}: ${XML_MIRRORS_MASTER} \
 		--param 'transtable-word-group' "'country'" \
 		--param 'transtable-sortkey.xml' "'$@.sort'" \
 		${XSL_TRANSTABLE} ${XML_MIRRORS_MASTER}
-	${RM} -f $@.sort $@.sort.tmp
+#	${RM} -f $@.sort $@.sort.tmp