Index: head/share/xml/events.dtd
===================================================================
--- head/share/xml/events.dtd	(revision 47026)
+++ head/share/xml/events.dtd	(revision 47027)
@@ -1,100 +1,105 @@
 <!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
      All rights reserved.
 
      Redistribution and use in source and binary forms, with or without
      modification, are permitted provided that the following conditions
      are met:
      1. Redistributions of source code must retain the above copyright
 	notice, this list of conditions and the following disclaimer.
      2. Redistributions in binary form must reproduce the above copyright
 	notice, this list of conditions and the following disclaimer in the
 	documentation and/or other materials provided with the distribution.
 
      THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
      ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
      ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
      FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
      DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
      OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
      OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
      SUCH DAMAGE.
 
      $FreeBSD$
 -->
 
 <!-- DTD for events.xml on the FreeBSD website. -->
 
 <!ELEMENT events (cvs:keyword?, event+)>
 
 <!ELEMENT event (name?, url?, startdate, enddate, location, description?, link*)>
 <!ATTLIST event id ID #REQUIRED>
 
 <!ELEMENT name (#PCDATA)>
 <!ELEMENT url (#PCDATA)>
 <!--
      Meaning of type attribute:
        freebsd-website:
 	 The URL is relative to the FreeBSD website root.
 	 The URL should start with a single "/".
        absolute:
 	 Normal absolute URL.
 -->
 <!ATTLIST url type (absolute|freebsd-website) "absolute">
 
 <!ELEMENT startdate (year,month,day)>
 <!ELEMENT enddate (year,month,day)>
 <!ELEMENT year (#PCDATA)>
 <!ELEMENT month (#PCDATA)>
 <!ELEMENT day (#PCDATA)>
 
 <!ELEMENT location (country?,state?,city?,site?,address?)>
 <!ELEMENT country (#PCDATA)>
 <!ELEMENT state (#PCDATA)>
 <!ELEMENT city (#PCDATA)>
 <!ELEMENT site (#PCDATA)>
 <!ELEMENT address (#PCDATA)>
 
 <!ELEMENT description (#PCDATA|a|tt|i|b)*>
 
 <!-- Misc HTML entities which might be used; just add more as needed -->
 <!ELEMENT a (#PCDATA)>
 <!ATTLIST a href CDATA #REQUIRED>
 
 <!ELEMENT b (#PCDATA|a)*>
 <!ELEMENT i (#PCDATA|a)*>
 <!ELEMENT tt (#PCDATA|a)*>
 
 <!--
      Link to a web page (local or remote) with additional information
      about the event.  Can also be used for post-event comments/notes.
 -->
 <!ELEMENT link (name, url)>
 <!ATTLIST link type (photos|notes|other) "other">
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
 	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
+
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;
Index: head/share/xml/gallery.dtd
===================================================================
--- head/share/xml/gallery.dtd	(revision 47026)
+++ head/share/xml/gallery.dtd	(revision 47027)
@@ -1,57 +1,62 @@
 <!-- DTD for commercial gallery entries on the FreeBSD website. -->
 <!-- $FreeBSD$ -->
 
 <!ELEMENT entries (cvs:keyword?, categories?, entry+)>
 
 <!ELEMENT categories (category)+>
 <!ATTLIST categories
   id		ID	#IMPLIED
 >
 
 <!ELEMENT category (#PCDATA)>
 <!ATTLIST category
   id		ID	#IMPLIED
 >
 
 <!ELEMENT entry (name, url?, description)>
 <!ATTLIST entry
   id		CDATA	#REQUIRED
   category	CDATA	#IMPLIED
 >
 
 <!ELEMENT name (#PCDATA)>
 <!ELEMENT url (#PCDATA)>
 
 <!--
      Allow full HTML cotent in description.
 -->
 <!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 %html.orig;
 
 <!ELEMENT description %Flow;>
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
 	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
+
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;
Index: head/share/xml/ideas.dtd
===================================================================
--- head/share/xml/ideas.dtd	(revision 47026)
+++ head/share/xml/ideas.dtd	(revision 47027)
@@ -1,53 +1,53 @@
 <!-- $FreeBSD$ -->
 
 <!ELEMENT ideas (cvs:keyword?, category)+>
 
 <!ELEMENT title (#PCDATA)>
 <!ATTLIST title
   id		ID	#IMPLIED
 >
 
 <!ELEMENT category (title, (idea)+)>
 <!ATTLIST category
   id		ID	#IMPLIED
 >
 
 <!ELEMENT idea (title, desc)>
 <!ATTLIST idea
   id		ID	#IMPLIED
 >
 
 <!ELEMENT desc (#PCDATA)>
 <!ATTLIST desc
   id		ID	#IMPLIED
 >
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
 	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "common.ent">
 %common.ent;
Index: head/share/xml/multimedia.dtd
===================================================================
--- head/share/xml/multimedia.dtd	(revision 47026)
+++ head/share/xml/multimedia.dtd	(revision 47027)
@@ -1,57 +1,57 @@
 <!-- $FreeBSD$ -->
 
 <!ELEMENT multimedia (items, sources)>
 
 <!ELEMENT items (item*)>
 <!ELEMENT item (title, overview, desc, tags)>
 <!ELEMENT overview (#PCDATA)>
 <!ELEMENT tags (tag)+>
 <!ELEMENT tag (#PCDATA)>
 
 <!ATTLIST item
 	source IDREF #REQUIRED
 	added CDATA #REQUIRED>
 
 <!ELEMENT sources (source*)>
 <!ELEMENT source (name, url)>
 <!ELEMENT name (#PCDATA)>
 <!ELEMENT url (#PCDATA)>
 
 <!ATTLIST source
 	id ID #REQUIRED>
 
 <!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 %html.orig;
 
 <!ELEMENT desc %Flow;>
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % release.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/release.ent">
 %release.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "common.ent">
 %common.ent;
Index: head/share/xml/news.dtd
===================================================================
--- head/share/xml/news.dtd	(revision 47026)
+++ head/share/xml/news.dtd	(revision 47027)
@@ -1,86 +1,86 @@
 <!-- $FreeBSD$ -->
 
 <!ENTITY lists 'https://lists.freebsd.org/pipermail'>
 <!ENTITY lists.announce '&lists;/freebsd-announce'>
 <!ENTITY lists.current '&lists;/freebsd-current'>
 <!ENTITY lists.stable '&lists;/freebsd-stable'>
 <!ENTITY lists.ports-announce '&lists;/freebsd-ports-announce'>
 <!ENTITY lists.pkg '&lists;/freebsd-pkg'>
 
 <!ELEMENT news (cvs:keyword?, year)+>
 
 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name
   id		ID	#IMPLIED
 >
 
 <!ELEMENT year (name, (month)+)>
 <!ATTLIST year
   id		ID	#IMPLIED
 >
 
 <!ELEMENT month (name, (day)+)>
 <!ATTLIST month
   id		ID	#IMPLIED
 >
 
 <!ELEMENT day (name, (event)+)>
 <!ATTLIST day
   id		ID	#IMPLIED
 >
 
 <!ELEMENT event ((title)?, (p)+)>
 <!ATTLIST event
   id		ID	#IMPLIED
 >
 
 <!ELEMENT title (#PCDATA | a)*>
 <!ATTLIST title
   id		ID	#IMPLIED
 >
 
 <!ELEMENT p (#PCDATA | a | i)*>
 <!ATTLIST p
   id		ID	#IMPLIED
 >
 
 <!ELEMENT a (#PCDATA)>
 <!ATTLIST a
   id		ID	#IMPLIED
   href		CDATA	#REQUIRED
 >
 
 <!ELEMENT i (#PCDATA)>
 <!ATTLIST i
   id		ID	#IMPLIED
 >
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
 	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "common.ent">
 %common.ent;
Index: head/share/xml/press.dtd
===================================================================
--- head/share/xml/press.dtd	(revision 47026)
+++ head/share/xml/press.dtd	(revision 47027)
@@ -1,77 +1,77 @@
 <!-- $FreeBSD$ -->
 
 <!ELEMENT press (cvs:keyword?, year)+>
 
 <!ELEMENT year (name, (month)+)>
 <!ATTLIST year
   id		ID	#IMPLIED
 >
 
 <!ELEMENT month (name, (story)+)>
 <!ATTLIST month
   id		ID	#IMPLIED
 >
 
 <!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 %html.orig;
 
 <!ELEMENT story (name, url, site-name, site-url, date, author, (p)+)>
 <!ATTLIST storyevent
   id		ID	#IMPLIED
 >
 
 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name
   id		ID	#IMPLIED
 >
 <!ELEMENT url (#PCDATA)>
 <!ATTLIST url
   id		ID	#IMPLIED
 >
 <!ELEMENT site-name (#PCDATA)>
 <!ATTLIST site-name
   id		ID	#IMPLIED
 >
 <!ELEMENT site-url (#PCDATA)>
 <!ATTLIST site-url
   id		ID	#IMPLIED
 >
 <!ELEMENT date (#PCDATA)>
 <!ATTLIST date
   id		ID	#IMPLIED
 >
 <!ELEMENT author (#PCDATA)>
 <!ATTLIST author
   id		ID	#IMPLIED
 >
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
 	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "common.ent">
 %common.ent;
Index: head/share/xml/sitemap.dtd
===================================================================
--- head/share/xml/sitemap.dtd	(revision 47026)
+++ head/share/xml/sitemap.dtd	(revision 47027)
@@ -1,47 +1,47 @@
 <!-- $FreeBSD$ -->
 
 <!ELEMENT sitemap (cvs:keyword?, term*, category*)>
 <!ELEMENT term (text, destination)>
 
 <!ELEMENT category (item*)>
 <!ATTLIST category name CDATA #REQUIRED>
 
 <!ELEMENT item (text, destination)>
 
 <!ELEMENT text (#PCDATA)>
 <!ELEMENT destination (#PCDATA)>
 
 <!ENTITY % cvs
  PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
 	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
-
+ 
 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n-common.ent;
 
 <!ENTITY % release.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/release.ent">
 %release.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "common.ent">
 %common.ent;
Index: head/share/xml/statusreport.dtd
===================================================================
--- head/share/xml/statusreport.dtd	(revision 47026)
+++ head/share/xml/statusreport.dtd	(revision 47027)
@@ -1,123 +1,128 @@
 <!-- $FreeBSD$ -->
 
 <!--
      Allow full HTML cotent in body.
 -->
 <!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 %html.orig;
 
 <!ELEMENT report (date, section, category+, project+)>
 
 <!ELEMENT date (month, year)>
 <!ATTLIST date
   id		ID	#IMPLIED
 >
 
 <!ELEMENT month (#PCDATA)>
 <!ATTLIST month
   id		ID	#IMPLIED
 >
 
 <!ELEMENT year (#PCDATA)>
 <!ATTLIST year
   id		ID	#IMPLIED
 >
 
 <!ELEMENT section (title, p+)>
 <!ATTLIST section
   id		ID	#IMPLIED
 >
 
 <!ELEMENT category (name, description)>
 <!ATTLIST category
   id		ID	#IMPLIED
 >
 
 <!ELEMENT name (#PCDATA | given | common)*>
 <!ATTLIST name
   id		ID	#IMPLIED
 >
 
 <!ELEMENT description (#PCDATA)>
 <!ATTLIST description
   id		ID	#IMPLIED
 >
 
 <!ELEMENT project (title, contact, links, body, sponsor*, help?)>
 <!ATTLIST project
   id		ID	#IMPLIED
   cat		CDATA	#REQUIRED
 >
 
 <!ELEMENT contact (person+)>
 <!ATTLIST contact
   id		ID	#IMPLIED
 >
 
 <!ELEMENT person (name, email)>
 <!ATTLIST person
   id		ID	#IMPLIED
 >
 
 <!ELEMENT given (#PCDATA)>
 <!ATTLIST given
   id		ID	#IMPLIED
 >
 
 <!ELEMENT common (#PCDATA)>
 <!ATTLIST common
   id		ID	#IMPLIED
 >
 
 <!ELEMENT email (#PCDATA)>
 <!ATTLIST email
   id		ID	#IMPLIED
 >
 
 <!ELEMENT links (url+)?>
 <!ATTLIST links
   id		ID	#IMPLIED
 >
 
 <!ELEMENT url (#PCDATA)>
 <!ATTLIST url
   id		ID	#IMPLIED
   href		CDATA	#REQUIRED
 >
 
 <!ELEMENT sponsor (#PCDATA)>
 
 <!ELEMENT help (task)+>
 <!ATTLIST help
   id		ID	#IMPLIED
 >
 
 <!ELEMENT task (#PCDATA)>
 <!ATTLIST task
   id		ID	#IMPLIED
 >
 
 <!ENTITY % autogen.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
         "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
+ 
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;
 
 <!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
 	"authors.ent">
 %authors;
Index: head/share/xml/usergroups.dtd
===================================================================
--- head/share/xml/usergroups.dtd	(revision 47026)
+++ head/share/xml/usergroups.dtd	(revision 47027)
@@ -1,38 +1,43 @@
 <!-- $FreeBSD$ -->
 
 <!ELEMENT usergroups (continent, entry)*>
 
 <!ELEMENT continent (country, entry)*>
 
 <!ELEMENT country (entity)*>
 
 <!ELEMENT entry (name, url, description)>
 <!ATTLIST entry
   id		ID	#IMPLIED
   continent	CDATA	#IMPLIED
 >
 
 <!ELEMENT name (#PCDATA)>
 
 <!ELEMENT url (#PCDATA)>
 
 <!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 %html.orig;
 
 <!ELEMENT description (#PCDATA|a)*>
 
 <!ENTITY % iso8879.ent
  PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
         "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
 
 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;
+
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
+%l10n-common.ent;
 
 <!ENTITY % common.ent
  PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
         "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;