From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Mon, 22 Jan 2007 07:01:36 +0000 (+0000)
Subject: Replaced all character entities and removed internal DTD subsets
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed70e2a40c2d4ec3234a05cefcf76c6389b08343;p=docbook-dsssl

Replaced all character entities and removed internal DTD subsets
(and thus removed reliance on external entity declarations for
ISO/W3C named character entities).
---

diff --git a/gentext/locale/README b/gentext/locale/README
index 867d1932b..346e6dec2 100644
--- a/gentext/locale/README
+++ b/gentext/locale/README
@@ -12,12 +12,12 @@ If you want to contribute a locale file for a language
 that is not in the current distribution, copy the
 en.xml file from here:
 
-  http://cvs.sourceforge.net/viewcvs.py/*checkout*/docbook/gentext/locale/en.xml
+  https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/en.xml
 
 If you want to make changes to an existing locale file,
 copy the appropriate locale file from:
 
-  http://cvs.sourceforge.net/viewcvs.py/docbook/gentext/locale/
+  https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/
 
 The main parts of the file that you need to translate are:
 
@@ -38,14 +38,14 @@ content of the <template> elements. In particular:
   <template name="Page">Page %p</template>
 
 NOTE: You don't have to translate empty elements such
-      as '<Chapter/>' that are used in the <template>
-      element content. For example, you can just leave
-      the <Chapter/> part of the following unchanged.
+as '<Chapter/>' that are used in the <template> element
+content. For example, you can just leave the <Chapter/>
+part of the following unchanged.
 
-      <template name="chapter"><Chapter/>&#160;%n.&#160;%t</template>
+  <template name="chapter"><Chapter/>&#160;%n.&#160;%t</template>
 
-      You'd only want to change the "&#160;%n.&#160;%t"
-      if needed for your locale.
+You'd only want to change the "&#160;%n.&#160;%t" if
+needed for your locale.
 
 -------------------------------------------------------
 ABOUT THE <letters> PART
@@ -95,20 +95,11 @@ part, post a request to docbook-apps@lists.oasis-open.org
 -------------------------------------------------------
 ABOUT ENCODINGS
 -------------------------------------------------------
-If possible, please encode your locale file into UTF-8
-(or convert it to UTF-8 before submitting it).  You can
-use either "real" Unicode characters or Unicode
-numerical character entities (hexadecimal or decimal)
-
-But if that is not possible, please be sure to set the
-correct value for the file's encoding in the XML
-prolog. For example,
-
-  <?xml version='1.0' encoding="EUC-JP"?>
-
-A DocBook developer will then attempt to convert the
-file encoding to UTF-8 before checking it into the
-project source-code repository.
+Encode your locale file into UTF-8 (or convert it to
+UTF-8 before submitting it).  Use "real" Unicode
+characters is possible; if not, use numerical character
+references (hexadecimal or decimal). Do not use named
+character entities.
 
 -------------------------------------------------------
 SUBMITTING A NEW OR CHANGED LOCALE FILE
@@ -123,14 +114,14 @@ And/or mail it to:
 
   docbook-developers@lists.sourceforge.net
 
-NOTE: It is important to zip the file to prevent the
-      possibility of the file being corrupted by mail
-      programs.
+NOTE: It's important to zip/compress/tar the file to
+prevent the possibility of the file being corrupted by
+mail programs.
 
 That's all you need to know in order to create, change,
 and submit locale files.
 
-But If you want more info, read on.
+If you want more info, read on.
 
 -------------------------------------------------------
                 BACKGROUND INFORMATION
@@ -209,7 +200,6 @@ with English versions.
 The DSSSL distribution uses the dsssl.xsl stylesheet instead.
 It does not backfill missing entries with English.
 
-
 -------------------------------------------------------
 Comparing a locale file to the en.xml file
 -------------------------------------------------------
diff --git a/gentext/locale/ca.xml b/gentext/locale/ca.xml
index 144df56dc..53d94924a 100644
--- a/gentext/locale/ca.xml
+++ b/gentext/locale/ca.xml
@@ -1,15 +1,10 @@
-<?xml version='1.0' encoding="utf-8"?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-]>
 <locale language="ca"
         english-language-name="Catalan"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
   <author><firstname>Jordi</firstname><surname>Vilalta</surname>
           <affiliation><address><email>jvprat@wanadoo.es</email></address>
@@ -23,29 +18,29 @@
 <gentext key="abstract" text="Resum"/>
 <gentext key="Answer" text="Resposta"/>
 <gentext key="answer" text="Resposta"/>
-<gentext key="Appendix" text="Ap&egrave;ndix"/>
-<gentext key="appendix" text="Ap&egrave;ndix"/>
+<gentext key="Appendix" text="Apèndix"/>
+<gentext key="appendix" text="Apèndix"/>
 <gentext key="Article" text="Article"/>
 <gentext key="article" text="Article"/>
 <gentext key="Bibliography" text="Bibliografia"/>
 <gentext key="bibliography" text="Bibliografia"/>
 <gentext key="Book" text="Llibre"/>
 <gentext key="book" text="Llibre"/>
-<gentext key="Caution" text="Atenci&oacute;"/>
-<gentext key="caution" text="Atenci&oacute;"/>
-<gentext key="CAUTION" text="ATENCI&Oacute;"/>
-<gentext key="Chapter" text="Cap&iacute;tol"/>
-<gentext key="chapter" text="Cap&iacute;tol"/>
-<gentext key="Colophon" text="Colof&oacute;"/>
-<gentext key="colophon" text="Colof&oacute;"/>
-<gentext key="Copyright" text="Dret de reproducci&oacute;"/>
-<gentext key="copyright" text="Dret de reproducci&oacute;"/>
-<gentext key="Dedication" text="Dedicat&ograve;ria"/>
-<gentext key="dedication" text="Dedicat&ograve;ria"/>
-<gentext key="Edition" text="Edici&oacute;"/>
-<gentext key="edition" text="Edici&oacute;"/>
-<gentext key="Equation" text="Equaci&oacute;"/>
-<gentext key="equation" text="Equaci&oacute;"/>
+<gentext key="Caution" text="Atenció"/>
+<gentext key="caution" text="Atenció"/>
+<gentext key="CAUTION" text="ATENCIÓ"/>
+<gentext key="Chapter" text="Capítol"/>
+<gentext key="chapter" text="Capítol"/>
+<gentext key="Colophon" text="Colofó"/>
+<gentext key="colophon" text="Colofó"/>
+<gentext key="Copyright" text="Dret de reproducció"/>
+<gentext key="copyright" text="Dret de reproducció"/>
+<gentext key="Dedication" text="Dedicatòria"/>
+<gentext key="dedication" text="Dedicatòria"/>
+<gentext key="Edition" text="Edició"/>
+<gentext key="edition" text="Edició"/>
+<gentext key="Equation" text="Equació"/>
+<gentext key="equation" text="Equació"/>
 <gentext key="Example" text="Exemple"/>
 <gentext key="example" text="Exemple"/>
 <gentext key="Figure" text="Figura"/>
@@ -54,19 +49,19 @@
 <gentext key="glossary" text="Glossari"/>
 <gentext key="GlossSee" text="Veure"/>
 <gentext key="glosssee" text="Veure"/>
-<gentext key="GlossSeeAlso" text="Veure tamb&eacute;"/>
-<gentext key="glossseealso" text="Veure tamb&eacute;"/>
+<gentext key="GlossSeeAlso" text="Veure també"/>
+<gentext key="glossseealso" text="Veure també"/>
 <gentext key="IMPORTANT" text="IMPORTANT"/>
 <gentext key="Important" text="Important"/>
 <gentext key="important" text="Important"/>
-<gentext key="Index" text="&Iacute;ndex alfab&egrave;tic"/>
-<gentext key="index" text="&Iacute;ndex alfab&egrave;tic"/>
+<gentext key="Index" text="Índex alfabètic"/>
+<gentext key="index" text="Índex alfabètic"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="ISBN"/>
-<gentext key="LegalNotice" text="Av&iacute;s legal"/>
-<gentext key="legalnotice" text="Av&iacute;s legal"/>
-<gentext key="MsgAud" text="Audi&egrave;ncia"/>
-<gentext key="msgaud" text="Audi&egrave;ncia"/>
+<gentext key="LegalNotice" text="Avís legal"/>
+<gentext key="legalnotice" text="Avís legal"/>
+<gentext key="MsgAud" text="Audiència"/>
+<gentext key="msgaud" text="Audiència"/>
 <gentext key="MsgLevel" text="Nivell"/>
 <gentext key="msglevel" text="Nivell"/>
 <gentext key="MsgOrig" text="Origen"/>
@@ -80,45 +75,45 @@
 <gentext key="preface" text="Prefaci"/>
 <gentext key="Procedure" text="Procediment"/>
 <gentext key="procedure" text="Procediment"/>
-<gentext key="ProductionSet" text="Producci&oacute;"/>
-<gentext key="PubDate" text="Data de publicaci&oacute;"/>
-<gentext key="pubdate" text="Data de publicaci&oacute;"/>
+<gentext key="ProductionSet" text="Producció"/>
+<gentext key="PubDate" text="Data de publicació"/>
+<gentext key="pubdate" text="Data de publicació"/>
 <gentext key="Published" text="Publicat"/>
 <gentext key="published" text="Publicat"/>
 <gentext key="Qandadiv" text="Pregunta i Resposta"/>
 <gentext key="qandadiv" text="Pregunta i Resposta"/>
 <gentext key="Question" text="Pregunta"/>
 <gentext key="question" text="Pregunta"/>
-<gentext key="RefEntry" text="Entrada de refer&egrave;ncia"/>
-<gentext key="refentry" text="Entrada de refer&egrave;ncia"/>
-<gentext key="Reference" text="Refer&egrave;ncia"/>
-<gentext key="reference" text="Refer&egrave;ncia"/>
+<gentext key="RefEntry" text="Entrada de referència"/>
+<gentext key="refentry" text="Entrada de referència"/>
+<gentext key="Reference" text="Referència"/>
+<gentext key="reference" text="Referència"/>
 <gentext key="RefName" text="Nom"/>
 <gentext key="refname" text="Nom"/>
-<gentext key="RefSection" text="Secci&oacute; de refer&egrave;ncia"/>
-<gentext key="refsection" text="Secci&oacute; de refer&egrave;ncia"/>
+<gentext key="RefSection" text="Secció de referència"/>
+<gentext key="refsection" text="Secció de referència"/>
 <gentext key="RefSynopsisDiv" text="Sinopsi"/>
 <gentext key="refsynopsisdiv" text="Sinopsi"/>
 <gentext key="RevHistory" text="Historial de revisions"/>
 <gentext key="revhistory" text="Historial de revisions"/>
-<gentext key="Revision" text="Revisi&oacute;"/>
-<gentext key="revision" text="Revisi&oacute;"/>
-<gentext key="sect1" text="Secci&oacute;"/>
-<gentext key="sect2" text="Secci&oacute;"/>
-<gentext key="sect3" text="Secci&oacute;"/>
-<gentext key="sect4" text="Secci&oacute;"/>
-<gentext key="sect5" text="Secci&oacute;"/>
-<gentext key="Section" text="Secci&oacute;"/>
-<gentext key="section" text="Secci&oacute;"/>
+<gentext key="Revision" text="Revisió"/>
+<gentext key="revision" text="Revisió"/>
+<gentext key="sect1" text="Secció"/>
+<gentext key="sect2" text="Secció"/>
+<gentext key="sect3" text="Secció"/>
+<gentext key="sect4" text="Secció"/>
+<gentext key="sect5" text="Secció"/>
+<gentext key="Section" text="Secció"/>
+<gentext key="section" text="Secció"/>
 <gentext key="See" text="Veure"/>
 <gentext key="see" text="Veure"/>
-<gentext key="SeeAlso" text="Veure Tamb&eacute;"/>
-<gentext key="Seealso" text="Veure tamb&eacute;"/>
-<gentext key="seealso" text="Veure tamb&eacute;"/>
+<gentext key="SeeAlso" text="Veure També"/>
+<gentext key="Seealso" text="Veure també"/>
+<gentext key="seealso" text="Veure també"/>
 <gentext key="Set" text="Conjunt"/>
 <gentext key="set" text="Conjunt"/>
-<gentext key="SetIndex" text="&Iacute;ndex del conjunt"/>
-<gentext key="setindex" text="&Iacute;ndex del conjunt"/>
+<gentext key="SetIndex" text="Índex del conjunt"/>
+<gentext key="setindex" text="Índex del conjunt"/>
 <gentext key="Sidebar" text="Barra lateral"/>
 <gentext key="sidebar" text="Barra lateral"/>
 <gentext key="step" text="Pas"/>
@@ -128,9 +123,9 @@
 <gentext key="TIP" text="SUGGERIMENT"/>
 <gentext key="Tip" text="Suggeriment"/>
 <gentext key="tip" text="Suggeriment"/>
-<gentext key="WARNING" text="AV&Iacute;S"/>
-<gentext key="Warning" text="Av&iacute;s"/>
-<gentext key="warning" text="Av&iacute;s"/>
+<gentext key="WARNING" text="AVÍS"/>
+<gentext key="Warning" text="Avís"/>
+<gentext key="warning" text="Avís"/>
 
 <gentext key="and" text="i"/>
 <gentext key="by" text="per"/>
@@ -144,8 +139,8 @@
 <gentext key="nonexistantelement" text="element inexistent"/>
 <gentext key="notes" text="notes"/>
 <gentext key="Notes" text="Notes"/>
-<gentext key="Pgs" text="P&agrave;gs."/>
-<gentext key="pgs" text="P&agrave;gs."/>
+<gentext key="Pgs" text="Pàgs."/>
+<gentext key="pgs" text="Pàgs."/>
 <gentext key="Revisedby" text="Revisat per: "/>
 <gentext key="revisedby" text="Revisat per: "/>
 <gentext key="TableNotes" text="Notes de taula"/>
@@ -154,40 +149,40 @@
 <gentext key="tableofcontents" text="Sumari"/>
 <gentext key="unexpectedelementname" text="nom d'element inesperat"/>
 <gentext key="unsupported" text="no reconeguda"/>
-<gentext key="xrefto" text="refer&egrave;ncia a"/>
-
-<gentext key="listofequations" text="&Iacute;ndex d'equacions"/>
-<gentext key="ListofEquations" text="&Iacute;ndex d'equacions"/>
-<gentext key="ListofExamples" text="&Iacute;ndex d'exemples"/>
-<gentext key="listofexamples" text="&Iacute;ndex d'exemples"/>
-<gentext key="ListofFigures" text="&Iacute;ndex de figures"/>
-<gentext key="listoffigures" text="&Iacute;ndex de figures"/>
-<gentext key="listoftables" text="&Iacute;ndex de taules"/>
-<gentext key="ListofTables" text="&Iacute;ndex de taules"/>
-<gentext key="ListofUnknown" text="&Iacute;ndex de desconegut ?"/>
-<gentext key="listofunknown" text="&Iacute;ndex de desconegut ?"/>
+<gentext key="xrefto" text="referència a"/>
+
+<gentext key="listofequations" text="Índex d'equacions"/>
+<gentext key="ListofEquations" text="Índex d'equacions"/>
+<gentext key="ListofExamples" text="Índex d'exemples"/>
+<gentext key="listofexamples" text="Índex d'exemples"/>
+<gentext key="ListofFigures" text="Índex de figures"/>
+<gentext key="listoffigures" text="Índex de figures"/>
+<gentext key="listoftables" text="Índex de taules"/>
+<gentext key="ListofTables" text="Índex de taules"/>
+<gentext key="ListofUnknown" text="Índex de desconegut ?"/>
+<gentext key="listofunknown" text="Índex de desconegut ?"/>
 
 <gentext key="nav-home" text="Inici"/>
-<gentext key="nav-next" text="Seg&uuml;ent"/>
-<gentext key="nav-next-sibling" text="Avan&ccedil;ar"/>
+<gentext key="nav-next" text="Següent"/>
+<gentext key="nav-next-sibling" text="Avançar"/>
 <gentext key="nav-prev" text="Anterior"/>
 <gentext key="nav-prev-sibling" text="Retrocedir"/>
 <gentext key="nav-up" text="Pujar"/>
 
-<gentext key="Draft"         text="Esborrany"/>
-<gentext key="above"         text="dalt"/>
-<gentext key="below"         text="baix"/>
-<gentext key="sectioncalled" text="secci&oacute; anomenada"/>
+<gentext key="Draft" text="Esborrany"/>
+<gentext key="above" text="dalt"/>
+<gentext key="below" text="baix"/>
+<gentext key="sectioncalled" text="secció anomenada"/>
 <gentext key="index symbols" text="Símbols"/>
 
-<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz&agrave;&egrave;&eacute;&iacute;&ograve;&oacute;&uacute;&ntilde;&ccedil;"/>
-<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ&Agrave;&Egrave;&Eacute;&Iacute;&Ograve;&Oacute;&Uacute;&Ntilde;&Ccedil;"/>
+<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzàèéíòóúñç"/>
+<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÀÈÉÍÒÓÚÑÇ"/>
 
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
diff --git a/gentext/locale/de.xml b/gentext/locale/de.xml
index b78569098..49b0dce44 100644
--- a/gentext/locale/de.xml
+++ b/gentext/locale/de.xml
@@ -1,15 +1,10 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-]>
 <locale language="de"
         english-language-name="German"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
   <author><firstname>Oliver</firstname><surname>Fischer</surname>
           <affiliation><address><email>plexus@snafu.de</email></address>
@@ -23,7 +18,7 @@
           <affiliation><address><email>michael.wiedmann@detewe.de</email></address>
           </affiliation>
   </author>
-  <author><firstname>Frank</firstname><surname>Sch&#xFC;tte</surname>
+  <author><firstname>Frank</firstname><surname>Schütte</surname>
           <affiliation><address><email>F.Schuette@t-online.de</email></address>
           </affiliation>
   </author>
@@ -93,10 +88,10 @@
 <gentext key="Procedure" text="Prozedur"/>
 <gentext key="procedure" text="Prozedur"/>
 <gentext key="ProductionSet" text="Produktion"/>
-<gentext key="PubDate" text="Ver&ouml;ffentlicht"/>
-<gentext key="pubdate" text="Ver&ouml;ffentlicht"/>
-<gentext key="Published" text="Ver&ouml;ffentlicht"/>
-<gentext key="published" text="Ver&ouml;ffentlicht"/>
+<gentext key="PubDate" text="Veröffentlicht"/>
+<gentext key="pubdate" text="Veröffentlicht"/>
+<gentext key="Published" text="Veröffentlicht"/>
+<gentext key="published" text="Veröffentlicht"/>
 <gentext key="Qandadiv" text="F &amp; A"/>
 <gentext key="qandadiv" text="F &amp; A"/>
 <gentext key="Question" text="F:"/>
@@ -154,19 +149,19 @@
 <gentext key="lastlistcomma" text=""/>
 <gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="nicht existierendes Element"/>
-<gentext key="notes" text="Fu&#x00DF;noten"/>
-<gentext key="Notes" text="Fu&#x00DF;noten"/>
+<gentext key="notes" text="Fußnoten"/>
+<gentext key="Notes" text="Fußnoten"/>
 <gentext key="Pgs" text="Seiten"/>
 <gentext key="pgs" text="Seiten"/>
-<gentext key="Revisedby" text="Ge&auml;ndert durch: "/>
-<gentext key="revisedby" text="Ge&auml;ndert durch: "/>
+<gentext key="Revisedby" text="Geändert durch: "/>
+<gentext key="revisedby" text="Geändert durch: "/>
 <gentext key="TableNotes" text="Bemerkungen"/>
 <gentext key="tablenotes" text="Bemerkungen"/>
 <gentext key="TableofContents" text="Inhaltsverzeichnis"/>
 <gentext key="tableofcontents" text="Inhaltsverzeichnis"/>
 <gentext key="the" text=""/>
 <gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
-<gentext key="unsupported" text="wird nicht unterst&uuml;tzt"/>
+<gentext key="unsupported" text="wird nicht unterstützt"/>
 <gentext key="xrefto" text="xref auf"/>
 
 <gentext key="listofequations" text="Gleichungen"/>
@@ -183,28 +178,28 @@
 <gentext key="nav-home" text="Zum Anfang"/>
 <gentext key="nav-next" text="Weiter"/>
 <gentext key="nav-next-sibling" text="Schnell weiter"/>
-<gentext key="nav-prev" text="Zur&uuml;ck"/>
-<gentext key="nav-prev-sibling" text="Schnell zur&uuml;ck"/>
+<gentext key="nav-prev" text="Zurück"/>
+<gentext key="nav-prev-sibling" text="Schnell zurück"/>
 <gentext key="nav-up" text="Nach oben"/>
 <gentext key="nav-toc" text="InhV"/>
   
 <gentext key="sectioncalled" text="der Abschnitt namens"/> 
-<gentext key="Draft"         text="Entwurf"/> 
-<gentext key="above"         text="oben"/> 
-<gentext key="below"         text="unten"/> 
+<gentext key="Draft" text="Entwurf"/> 
+<gentext key="above" text="oben"/> 
+<gentext key="below" text="unten"/> 
 <gentext key="index symbols" text="Symbole"/>
 
 
-<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz&#x00E4;&#x00F6;&#x00FC;&#x00DF;"/> 
-<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ&#x00C4;&#x00D6;&#x00DC;&#x00DF;"/> 
+<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzäöüß"/> 
+<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜß"/> 
 
-<dingbat key="startquote" text="&#x201E;"/>
-<dingbat key="endquote" text="&#x201C;"/>
-<dingbat key="nestedstartquote" text="&#x201A;"/>
-<dingbat key="nestedendquote" text="&#x2018;"/>
-<dingbat key="singlestartquote" text="&#x201A;"/>
-<dingbat key="singleendquote" text="&#x2018;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="„"/>
+<dingbat key="endquote" text="“"/>
+<dingbat key="nestedstartquote" text="‚"/>
+<dingbat key="nestedendquote" text="‘"/>
+<dingbat key="singlestartquote" text="‚"/>
+<dingbat key="singleendquote" text="‘"/>
+<dingbat key="bullet" text="•"/>
 
 <!-- Hier mu"s"te man mal nachforschen, wie die Silbentrennung
      im Typografiebereich gehandhabt wird.
@@ -532,7 +527,7 @@
 <context name="datetime-full">
 <template name="January">Januar</template>
 <template name="February">Februar</template>
-<template name="March">M&#x00E4;rz</template>
+<template name="March">März</template>
 <template name="April">April</template>
 <template name="May">Mai</template>
 <template name="June">Juni</template>
diff --git a/gentext/locale/en.xml b/gentext/locale/en.xml
index a9b2ca04d..11db9d67a 100644
--- a/gentext/locale/en.xml
+++ b/gentext/locale/en.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding="utf-8"?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
 <locale language="en"
         english-language-name="English"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
   <author><firstname>Norman</firstname><surname>Walsh</surname>
           <affiliation><address><email>ndw@nwalsh.com</email></address>
@@ -190,22 +190,22 @@
 <gentext key="nav-up" text="Up"/>
 <gentext key="nav-toc" text="ToC"/>
 
-<gentext key="Draft"         text="Draft"/>
-<gentext key="above"         text="above"/>
-<gentext key="below"         text="below"/>
+<gentext key="Draft" text="Draft"/>
+<gentext key="above" text="above"/>
+<gentext key="below" text="below"/>
 <gentext key="sectioncalled" text="the section called"/>
 <gentext key="index symbols" text="Symbols"/>
 
 <gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="singlestartquote" text="&#x2018;"/>
-<dingbat key="singleendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="singlestartquote" text="‘"/>
+<dingbat key="singleendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <!-- n.b. &#x2010; might be better, but it doesn't always render properly -->
 <gentext key="hyphenation-character" text="-"/>
@@ -602,625 +602,625 @@
   <l i="0">Symbols</l>
   <l i="10">A</l>
   <l i="10">a</l>
-  <l i="10">&#x00C0;</l>
-  <l i="10">&#x00E0;</l>
-  <l i="10">&#x00C1;</l>
-  <l i="10">&#x00E1;</l>
-  <l i="10">&#x00C2;</l>
-  <l i="10">&#x00E2;</l>
-  <l i="10">&#x00C3;</l>
-  <l i="10">&#x00E3;</l>
-  <l i="10">&#x00C4;</l>
-  <l i="10">&#x00E4;</l>
-  <l i="10">&#x00C5;</l>
-  <l i="10">&#x00E5;</l>
-  <l i="10">&#x0100;</l>
-  <l i="10">&#x0101;</l>
-  <l i="10">&#x0102;</l>
-  <l i="10">&#x0103;</l>
-  <l i="10">&#x0104;</l>
-  <l i="10">&#x0105;</l>
-  <l i="10">&#x01CD;</l>
-  <l i="10">&#x01CE;</l>
-  <l i="10">&#x01DE;</l>
-  <l i="10">&#x01DF;</l>
-  <l i="10">&#x01E0;</l>
-  <l i="10">&#x01E1;</l>
-  <l i="10">&#x01FA;</l>
-  <l i="10">&#x01FB;</l>
-  <l i="10">&#x0200;</l>
-  <l i="10">&#x0201;</l>
-  <l i="10">&#x0202;</l>
-  <l i="10">&#x0203;</l>
-  <l i="10">&#x0226;</l>
-  <l i="10">&#x0227;</l>
-  <l i="10">&#x1E00;</l>
-  <l i="10">&#x1E01;</l>
-  <l i="10">&#x1E9A;</l>
-  <l i="10">&#x1EA0;</l>
-  <l i="10">&#x1EA1;</l>
-  <l i="10">&#x1EA2;</l>
-  <l i="10">&#x1EA3;</l>
-  <l i="10">&#x1EA4;</l>
-  <l i="10">&#x1EA5;</l>
-  <l i="10">&#x1EA6;</l>
-  <l i="10">&#x1EA7;</l>
-  <l i="10">&#x1EA8;</l>
-  <l i="10">&#x1EA9;</l>
-  <l i="10">&#x1EAA;</l>
-  <l i="10">&#x1EAB;</l>
-  <l i="10">&#x1EAC;</l>
-  <l i="10">&#x1EAD;</l>
-  <l i="10">&#x1EAE;</l>
-  <l i="10">&#x1EAF;</l>
-  <l i="10">&#x1EB0;</l>
-  <l i="10">&#x1EB1;</l>
-  <l i="10">&#x1EB2;</l>
-  <l i="10">&#x1EB3;</l>
-  <l i="10">&#x1EB4;</l>
-  <l i="10">&#x1EB5;</l>
-  <l i="10">&#x1EB6;</l>
-  <l i="10">&#x1EB7;</l>
+  <l i="10">À</l>
+  <l i="10">à</l>
+  <l i="10">Á</l>
+  <l i="10">á</l>
+  <l i="10">Â</l>
+  <l i="10">â</l>
+  <l i="10">Ã</l>
+  <l i="10">ã</l>
+  <l i="10">Ä</l>
+  <l i="10">ä</l>
+  <l i="10">Å</l>
+  <l i="10">Ã¥</l>
+  <l i="10">Ā</l>
+  <l i="10">ā</l>
+  <l i="10">Ă</l>
+  <l i="10">ă</l>
+  <l i="10">Ą</l>
+  <l i="10">ą</l>
+  <l i="10">Ǎ</l>
+  <l i="10">ǎ</l>
+  <l i="10">Ǟ</l>
+  <l i="10">ǟ</l>
+  <l i="10">Ç </l>
+  <l i="10">Ç¡</l>
+  <l i="10">Ǻ</l>
+  <l i="10">Ç»</l>
+  <l i="10">Ȁ</l>
+  <l i="10">ȁ</l>
+  <l i="10">Ȃ</l>
+  <l i="10">ȃ</l>
+  <l i="10">Ȧ</l>
+  <l i="10">ȧ</l>
+  <l i="10">Ḁ</l>
+  <l i="10">ḁ</l>
+  <l i="10">ẚ</l>
+  <l i="10">Ạ</l>
+  <l i="10">ạ</l>
+  <l i="10">Ả</l>
+  <l i="10">ả</l>
+  <l i="10">Ấ</l>
+  <l i="10">ấ</l>
+  <l i="10">Ầ</l>
+  <l i="10">ầ</l>
+  <l i="10">Ẩ</l>
+  <l i="10">ẩ</l>
+  <l i="10">Ẫ</l>
+  <l i="10">ẫ</l>
+  <l i="10">Ậ</l>
+  <l i="10">ậ</l>
+  <l i="10">Ắ</l>
+  <l i="10">ắ</l>
+  <l i="10">Ằ</l>
+  <l i="10">ằ</l>
+  <l i="10">Ẳ</l>
+  <l i="10">ẳ</l>
+  <l i="10">Ẵ</l>
+  <l i="10">ẵ</l>
+  <l i="10">Ặ</l>
+  <l i="10">ặ</l>
   <l i="20">B</l>
   <l i="20">b</l>
-  <l i="20">&#x0180;</l>
-  <l i="20">&#x0181;</l>
-  <l i="20">&#x0253;</l>
-  <l i="20">&#x0182;</l>
-  <l i="20">&#x0183;</l>
-  <l i="20">&#x1E02;</l>
-  <l i="20">&#x1E03;</l>
-  <l i="20">&#x1E04;</l>
-  <l i="20">&#x1E05;</l>
-  <l i="20">&#x1E06;</l>
-  <l i="20">&#x1E07;</l>
+  <l i="20">ƀ</l>
+  <l i="20">Ɓ</l>
+  <l i="20">ɓ</l>
+  <l i="20">Ƃ</l>
+  <l i="20">ƃ</l>
+  <l i="20">Ḃ</l>
+  <l i="20">ḃ</l>
+  <l i="20">Ḅ</l>
+  <l i="20">ḅ</l>
+  <l i="20">Ḇ</l>
+  <l i="20">ḇ</l>
   <l i="30">C</l>
   <l i="30">c</l>
-  <l i="30">&#x00C7;</l>
-  <l i="30">&#x00E7;</l>
-  <l i="30">&#x0106;</l>
-  <l i="30">&#x0107;</l>
-  <l i="30">&#x0108;</l>
-  <l i="30">&#x0109;</l>
-  <l i="30">&#x010A;</l>
-  <l i="30">&#x010B;</l>
-  <l i="30">&#x010C;</l>
-  <l i="30">&#x010D;</l>
-  <l i="30">&#x0187;</l>
-  <l i="30">&#x0188;</l>
-  <l i="30">&#x0255;</l>
-  <l i="30">&#x1E08;</l>
-  <l i="30">&#x1E09;</l>
+  <l i="30">Ç</l>
+  <l i="30">ç</l>
+  <l i="30">Ć</l>
+  <l i="30">ć</l>
+  <l i="30">Ĉ</l>
+  <l i="30">ĉ</l>
+  <l i="30">Ċ</l>
+  <l i="30">ċ</l>
+  <l i="30">Č</l>
+  <l i="30">č</l>
+  <l i="30">Ƈ</l>
+  <l i="30">ƈ</l>
+  <l i="30">ɕ</l>
+  <l i="30">Ḉ</l>
+  <l i="30">ḉ</l>
   <l i="40">D</l>
   <l i="40">d</l>
-  <l i="40">&#x010E;</l>
-  <l i="40">&#x010F;</l>
-  <l i="40">&#x0110;</l>
-  <l i="40">&#x0111;</l>
-  <l i="40">&#x018A;</l>
-  <l i="40">&#x0257;</l>
-  <l i="40">&#x018B;</l>
-  <l i="40">&#x018C;</l>
-  <l i="40">&#x01C5;</l>
-  <l i="40">&#x01F2;</l>
-  <l i="40">&#x0221;</l>
-  <l i="40">&#x0256;</l>
-  <l i="40">&#x1E0A;</l>
-  <l i="40">&#x1E0B;</l>
-  <l i="40">&#x1E0C;</l>
-  <l i="40">&#x1E0D;</l>
-  <l i="40">&#x1E0E;</l>
-  <l i="40">&#x1E0F;</l>
-  <l i="40">&#x1E10;</l>
-  <l i="40">&#x1E11;</l>
-  <l i="40">&#x1E12;</l>
-  <l i="40">&#x1E13;</l>
+  <l i="40">Ď</l>
+  <l i="40">ď</l>
+  <l i="40">Đ</l>
+  <l i="40">đ</l>
+  <l i="40">Ɗ</l>
+  <l i="40">ɗ</l>
+  <l i="40">Ƌ</l>
+  <l i="40">ƌ</l>
+  <l i="40">Dž</l>
+  <l i="40">Dz</l>
+  <l i="40">È¡</l>
+  <l i="40">ɖ</l>
+  <l i="40">Ḋ</l>
+  <l i="40">ḋ</l>
+  <l i="40">Ḍ</l>
+  <l i="40">ḍ</l>
+  <l i="40">Ḏ</l>
+  <l i="40">ḏ</l>
+  <l i="40">Ḑ</l>
+  <l i="40">ḑ</l>
+  <l i="40">Ḓ</l>
+  <l i="40">ḓ</l>
   <l i="50">E</l>
   <l i="50">e</l>
-  <l i="50">&#x00C8;</l>
-  <l i="50">&#x00E8;</l>
-  <l i="50">&#x00C9;</l>
-  <l i="50">&#x00E9;</l>
-  <l i="50">&#x00CA;</l>
-  <l i="50">&#x00EA;</l>
-  <l i="50">&#x00CB;</l>
-  <l i="50">&#x00EB;</l>
-  <l i="50">&#x0112;</l>
-  <l i="50">&#x0113;</l>
-  <l i="50">&#x0114;</l>
-  <l i="50">&#x0115;</l>
-  <l i="50">&#x0116;</l>
-  <l i="50">&#x0117;</l>
-  <l i="50">&#x0118;</l>
-  <l i="50">&#x0119;</l>
-  <l i="50">&#x011A;</l>
-  <l i="50">&#x011B;</l>
-  <l i="50">&#x0204;</l>
-  <l i="50">&#x0205;</l>
-  <l i="50">&#x0206;</l>
-  <l i="50">&#x0207;</l>
-  <l i="50">&#x0228;</l>
-  <l i="50">&#x0229;</l>
-  <l i="50">&#x1E14;</l>
-  <l i="50">&#x1E15;</l>
-  <l i="50">&#x1E16;</l>
-  <l i="50">&#x1E17;</l>
-  <l i="50">&#x1E18;</l>
-  <l i="50">&#x1E19;</l>
-  <l i="50">&#x1E1A;</l>
-  <l i="50">&#x1E1B;</l>
-  <l i="50">&#x1E1C;</l>
-  <l i="50">&#x1E1D;</l>
-  <l i="50">&#x1EB8;</l>
-  <l i="50">&#x1EB9;</l>
-  <l i="50">&#x1EBA;</l>
-  <l i="50">&#x1EBB;</l>
-  <l i="50">&#x1EBC;</l>
-  <l i="50">&#x1EBD;</l>
-  <l i="50">&#x1EBE;</l>
-  <l i="50">&#x1EBF;</l>
-  <l i="50">&#x1EC0;</l>
-  <l i="50">&#x1EC1;</l>
-  <l i="50">&#x1EC2;</l>
-  <l i="50">&#x1EC3;</l>
-  <l i="50">&#x1EC4;</l>
-  <l i="50">&#x1EC5;</l>
-  <l i="50">&#x1EC6;</l>
-  <l i="50">&#x1EC7;</l>
+  <l i="50">È</l>
+  <l i="50">è</l>
+  <l i="50">É</l>
+  <l i="50">é</l>
+  <l i="50">Ê</l>
+  <l i="50">ê</l>
+  <l i="50">Ë</l>
+  <l i="50">ë</l>
+  <l i="50">Ē</l>
+  <l i="50">ē</l>
+  <l i="50">Ĕ</l>
+  <l i="50">ĕ</l>
+  <l i="50">Ė</l>
+  <l i="50">ė</l>
+  <l i="50">Ę</l>
+  <l i="50">ę</l>
+  <l i="50">Ě</l>
+  <l i="50">ě</l>
+  <l i="50">Ȅ</l>
+  <l i="50">ȅ</l>
+  <l i="50">Ȇ</l>
+  <l i="50">ȇ</l>
+  <l i="50">Ȩ</l>
+  <l i="50">È©</l>
+  <l i="50">Ḕ</l>
+  <l i="50">ḕ</l>
+  <l i="50">Ḗ</l>
+  <l i="50">ḗ</l>
+  <l i="50">Ḙ</l>
+  <l i="50">ḙ</l>
+  <l i="50">Ḛ</l>
+  <l i="50">ḛ</l>
+  <l i="50">Ḝ</l>
+  <l i="50">ḝ</l>
+  <l i="50">Ẹ</l>
+  <l i="50">ẹ</l>
+  <l i="50">Ẻ</l>
+  <l i="50">ẻ</l>
+  <l i="50">Ẽ</l>
+  <l i="50">ẽ</l>
+  <l i="50">Ế</l>
+  <l i="50">ế</l>
+  <l i="50">Ề</l>
+  <l i="50">ề</l>
+  <l i="50">Ể</l>
+  <l i="50">ể</l>
+  <l i="50">Ễ</l>
+  <l i="50">ễ</l>
+  <l i="50">Ệ</l>
+  <l i="50">ệ</l>
   <l i="60">F</l>
   <l i="60">f</l>
-  <l i="60">&#x0191;</l>
-  <l i="60">&#x0192;</l>
-  <l i="60">&#x1E1E;</l>
-  <l i="60">&#x1E1F;</l>
+  <l i="60">Ƒ</l>
+  <l i="60">ƒ</l>
+  <l i="60">Ḟ</l>
+  <l i="60">ḟ</l>
   <l i="70">G</l>
   <l i="70">g</l>
-  <l i="70">&#x011C;</l>
-  <l i="70">&#x011D;</l>
-  <l i="70">&#x011E;</l>
-  <l i="70">&#x011F;</l>
-  <l i="70">&#x0120;</l>
-  <l i="70">&#x0121;</l>
-  <l i="70">&#x0122;</l>
-  <l i="70">&#x0123;</l>
-  <l i="70">&#x0193;</l>
-  <l i="70">&#x0260;</l>
-  <l i="70">&#x01E4;</l>
-  <l i="70">&#x01E5;</l>
-  <l i="70">&#x01E6;</l>
-  <l i="70">&#x01E7;</l>
-  <l i="70">&#x01F4;</l>
-  <l i="70">&#x01F5;</l>
-  <l i="70">&#x1E20;</l>
-  <l i="70">&#x1E21;</l>
+  <l i="70">Ĝ</l>
+  <l i="70">ĝ</l>
+  <l i="70">Ğ</l>
+  <l i="70">ğ</l>
+  <l i="70">Ä </l>
+  <l i="70">Ä¡</l>
+  <l i="70">Ä¢</l>
+  <l i="70">Ä£</l>
+  <l i="70">Ɠ</l>
+  <l i="70">É </l>
+  <l i="70">Ǥ</l>
+  <l i="70">Ç¥</l>
+  <l i="70">Ǧ</l>
+  <l i="70">ǧ</l>
+  <l i="70">Ç´</l>
+  <l i="70">ǵ</l>
+  <l i="70">Ḡ</l>
+  <l i="70">ḡ</l>
   <l i="80">H</l>
   <l i="80">h</l>
-  <l i="80">&#x0124;</l>
-  <l i="80">&#x0125;</l>
-  <l i="80">&#x0126;</l>
-  <l i="80">&#x0127;</l>
-  <l i="80">&#x021E;</l>
-  <l i="80">&#x021F;</l>
-  <l i="80">&#x0266;</l>
-  <l i="80">&#x1E22;</l>
-  <l i="80">&#x1E23;</l>
-  <l i="80">&#x1E24;</l>
-  <l i="80">&#x1E25;</l>
-  <l i="80">&#x1E26;</l>
-  <l i="80">&#x1E27;</l>
-  <l i="80">&#x1E28;</l>
-  <l i="80">&#x1E29;</l>
-  <l i="80">&#x1E2A;</l>
-  <l i="80">&#x1E2B;</l>
-  <l i="80">&#x1E96;</l>
+  <l i="80">Ĥ</l>
+  <l i="80">Ä¥</l>
+  <l i="80">Ħ</l>
+  <l i="80">ħ</l>
+  <l i="80">Ȟ</l>
+  <l i="80">ȟ</l>
+  <l i="80">ɦ</l>
+  <l i="80">Ḣ</l>
+  <l i="80">ḣ</l>
+  <l i="80">Ḥ</l>
+  <l i="80">ḥ</l>
+  <l i="80">Ḧ</l>
+  <l i="80">ḧ</l>
+  <l i="80">Ḩ</l>
+  <l i="80">ḩ</l>
+  <l i="80">Ḫ</l>
+  <l i="80">ḫ</l>
+  <l i="80">ẖ</l>
   <l i="90">I</l>
   <l i="90">i</l>
-  <l i="90">&#x00CC;</l>
-  <l i="90">&#x00EC;</l>
-  <l i="90">&#x00CD;</l>
-  <l i="90">&#x00ED;</l>
-  <l i="90">&#x00CE;</l>
-  <l i="90">&#x00EE;</l>
-  <l i="90">&#x00CF;</l>
-  <l i="90">&#x00EF;</l>
-  <l i="90">&#x0128;</l>
-  <l i="90">&#x0129;</l>
-  <l i="90">&#x012A;</l>
-  <l i="90">&#x012B;</l>
-  <l i="90">&#x012C;</l>
-  <l i="90">&#x012D;</l>
-  <l i="90">&#x012E;</l>
-  <l i="90">&#x012F;</l>
-  <l i="90">&#x0130;</l>
-  <l i="90">&#x0197;</l>
-  <l i="90">&#x0268;</l>
-  <l i="90">&#x01CF;</l>
-  <l i="90">&#x01D0;</l>
-  <l i="90">&#x0208;</l>
-  <l i="90">&#x0209;</l>
-  <l i="90">&#x020A;</l>
-  <l i="90">&#x020B;</l>
-  <l i="90">&#x1E2C;</l>
-  <l i="90">&#x1E2D;</l>
-  <l i="90">&#x1E2E;</l>
-  <l i="90">&#x1E2F;</l>
-  <l i="90">&#x1EC8;</l>
-  <l i="90">&#x1EC9;</l>
-  <l i="90">&#x1ECA;</l>
-  <l i="90">&#x1ECB;</l>
+  <l i="90">Ì</l>
+  <l i="90">ì</l>
+  <l i="90">Í</l>
+  <l i="90">í</l>
+  <l i="90">Î</l>
+  <l i="90">î</l>
+  <l i="90">Ï</l>
+  <l i="90">ï</l>
+  <l i="90">Ĩ</l>
+  <l i="90">Ä©</l>
+  <l i="90">Ī</l>
+  <l i="90">Ä«</l>
+  <l i="90">Ĭ</l>
+  <l i="90">Ä­</l>
+  <l i="90">Ä®</l>
+  <l i="90">į</l>
+  <l i="90">Ä°</l>
+  <l i="90">Ɨ</l>
+  <l i="90">ɨ</l>
+  <l i="90">Ǐ</l>
+  <l i="90">ǐ</l>
+  <l i="90">Ȉ</l>
+  <l i="90">ȉ</l>
+  <l i="90">Ȋ</l>
+  <l i="90">ȋ</l>
+  <l i="90">Ḭ</l>
+  <l i="90">ḭ</l>
+  <l i="90">Ḯ</l>
+  <l i="90">ḯ</l>
+  <l i="90">Ỉ</l>
+  <l i="90">ỉ</l>
+  <l i="90">Ị</l>
+  <l i="90">ị</l>
   <l i="100">J</l>
   <l i="100">j</l>
-  <l i="100">&#x0134;</l>
-  <l i="100">&#x0135;</l>
-  <l i="100">&#x01F0;</l>
-  <l i="100">&#x029D;</l>
+  <l i="100">Ä´</l>
+  <l i="100">ĵ</l>
+  <l i="100">Ç°</l>
+  <l i="100">ʝ</l>
   <l i="110">K</l>
   <l i="110">k</l>
-  <l i="110">&#x0136;</l>
-  <l i="110">&#x0137;</l>
-  <l i="110">&#x0198;</l>
-  <l i="110">&#x0199;</l>
-  <l i="110">&#x01E8;</l>
-  <l i="110">&#x01E9;</l>
-  <l i="110">&#x1E30;</l>
-  <l i="110">&#x1E31;</l>
-  <l i="110">&#x1E32;</l>
-  <l i="110">&#x1E33;</l>
-  <l i="110">&#x1E34;</l>
-  <l i="110">&#x1E35;</l>
+  <l i="110">Ķ</l>
+  <l i="110">Ä·</l>
+  <l i="110">Ƙ</l>
+  <l i="110">ƙ</l>
+  <l i="110">Ǩ</l>
+  <l i="110">Ç©</l>
+  <l i="110">Ḱ</l>
+  <l i="110">ḱ</l>
+  <l i="110">Ḳ</l>
+  <l i="110">ḳ</l>
+  <l i="110">Ḵ</l>
+  <l i="110">ḵ</l>
   <l i="120">L</l>
   <l i="120">l</l>
-  <l i="120">&#x0139;</l>
-  <l i="120">&#x013A;</l>
-  <l i="120">&#x013B;</l>
-  <l i="120">&#x013C;</l>
-  <l i="120">&#x013D;</l>
-  <l i="120">&#x013E;</l>
-  <l i="120">&#x013F;</l>
-  <l i="120">&#x0140;</l>
-  <l i="120">&#x0141;</l>
-  <l i="120">&#x0142;</l>
-  <l i="120">&#x019A;</l>
-  <l i="120">&#x01C8;</l>
-  <l i="120">&#x0234;</l>
-  <l i="120">&#x026B;</l>
-  <l i="120">&#x026C;</l>
-  <l i="120">&#x026D;</l>
-  <l i="120">&#x1E36;</l>
-  <l i="120">&#x1E37;</l>
-  <l i="120">&#x1E38;</l>
-  <l i="120">&#x1E39;</l>
-  <l i="120">&#x1E3A;</l>
-  <l i="120">&#x1E3B;</l>
-  <l i="120">&#x1E3C;</l>
-  <l i="120">&#x1E3D;</l>
+  <l i="120">Ĺ</l>
+  <l i="120">ĺ</l>
+  <l i="120">Ä»</l>
+  <l i="120">ļ</l>
+  <l i="120">Ľ</l>
+  <l i="120">ľ</l>
+  <l i="120">Ä¿</l>
+  <l i="120">ŀ</l>
+  <l i="120">Ł</l>
+  <l i="120">ł</l>
+  <l i="120">ƚ</l>
+  <l i="120">Lj</l>
+  <l i="120">È´</l>
+  <l i="120">É«</l>
+  <l i="120">ɬ</l>
+  <l i="120">É­</l>
+  <l i="120">Ḷ</l>
+  <l i="120">ḷ</l>
+  <l i="120">Ḹ</l>
+  <l i="120">ḹ</l>
+  <l i="120">Ḻ</l>
+  <l i="120">ḻ</l>
+  <l i="120">Ḽ</l>
+  <l i="120">ḽ</l>
   <l i="130">M</l>
   <l i="130">m</l>
-  <l i="130">&#x0271;</l>
-  <l i="130">&#x1E3E;</l>
-  <l i="130">&#x1E3F;</l>
-  <l i="130">&#x1E40;</l>
-  <l i="130">&#x1E41;</l>
-  <l i="130">&#x1E42;</l>
-  <l i="130">&#x1E43;</l>
+  <l i="130">ɱ</l>
+  <l i="130">Ḿ</l>
+  <l i="130">ḿ</l>
+  <l i="130">Ṁ</l>
+  <l i="130">ṁ</l>
+  <l i="130">Ṃ</l>
+  <l i="130">ṃ</l>
   <l i="140">N</l>
   <l i="140">n</l>
-  <l i="140">&#x00D1;</l>
-  <l i="140">&#x00F1;</l>
-  <l i="140">&#x0143;</l>
-  <l i="140">&#x0144;</l>
-  <l i="140">&#x0145;</l>
-  <l i="140">&#x0146;</l>
-  <l i="140">&#x0147;</l>
-  <l i="140">&#x0148;</l>
-  <l i="140">&#x019D;</l>
-  <l i="140">&#x0272;</l>
-  <l i="140">&#x019E;</l>
-  <l i="140">&#x0220;</l>
-  <l i="140">&#x01CB;</l>
-  <l i="140">&#x01F8;</l>
-  <l i="140">&#x01F9;</l>
-  <l i="140">&#x0235;</l>
-  <l i="140">&#x0273;</l>
-  <l i="140">&#x1E44;</l>
-  <l i="140">&#x1E45;</l>
-  <l i="140">&#x1E46;</l>
-  <l i="140">&#x1E47;</l>
-  <l i="140">&#x1E48;</l>
-  <l i="140">&#x1E49;</l>
-  <l i="140">&#x1E4A;</l>
-  <l i="140">&#x1E4B;</l>
+  <l i="140">Ñ</l>
+  <l i="140">ñ</l>
+  <l i="140">Ń</l>
+  <l i="140">ń</l>
+  <l i="140">Ņ</l>
+  <l i="140">ņ</l>
+  <l i="140">Ň</l>
+  <l i="140">ň</l>
+  <l i="140">Ɲ</l>
+  <l i="140">ɲ</l>
+  <l i="140">ƞ</l>
+  <l i="140">È </l>
+  <l i="140">Nj</l>
+  <l i="140">Ǹ</l>
+  <l i="140">ǹ</l>
+  <l i="140">ȵ</l>
+  <l i="140">ɳ</l>
+  <l i="140">Ṅ</l>
+  <l i="140">ṅ</l>
+  <l i="140">Ṇ</l>
+  <l i="140">ṇ</l>
+  <l i="140">Ṉ</l>
+  <l i="140">ṉ</l>
+  <l i="140">Ṋ</l>
+  <l i="140">ṋ</l>
   <l i="150">O</l>
   <l i="150">o</l>
-  <l i="150">&#x00D2;</l>
-  <l i="150">&#x00F2;</l>
-  <l i="150">&#x00D3;</l>
-  <l i="150">&#x00F3;</l>
-  <l i="150">&#x00D4;</l>
-  <l i="150">&#x00F4;</l>
-  <l i="150">&#x00D5;</l>
-  <l i="150">&#x00F5;</l>
-  <l i="150">&#x00D6;</l>
-  <l i="150">&#x00F6;</l>
-  <l i="150">&#x00D8;</l>
-  <l i="150">&#x00F8;</l>
-  <l i="150">&#x014C;</l>
-  <l i="150">&#x014D;</l>
-  <l i="150">&#x014E;</l>
-  <l i="150">&#x014F;</l>
-  <l i="150">&#x0150;</l>
-  <l i="150">&#x0151;</l>
-  <l i="150">&#x019F;</l>
-  <l i="150">&#x01A0;</l>
-  <l i="150">&#x01A1;</l>
-  <l i="150">&#x01D1;</l>
-  <l i="150">&#x01D2;</l>
-  <l i="150">&#x01EA;</l>
-  <l i="150">&#x01EB;</l>
-  <l i="150">&#x01EC;</l>
-  <l i="150">&#x01ED;</l>
-  <l i="150">&#x01FE;</l>
-  <l i="150">&#x01FF;</l>
-  <l i="150">&#x020C;</l>
-  <l i="150">&#x020D;</l>
-  <l i="150">&#x020E;</l>
-  <l i="150">&#x020F;</l>
-  <l i="150">&#x022A;</l>
-  <l i="150">&#x022B;</l>
-  <l i="150">&#x022C;</l>
-  <l i="150">&#x022D;</l>
-  <l i="150">&#x022E;</l>
-  <l i="150">&#x022F;</l>
-  <l i="150">&#x0230;</l>
-  <l i="150">&#x0231;</l>
-  <l i="150">&#x1E4C;</l>
-  <l i="150">&#x1E4D;</l>
-  <l i="150">&#x1E4E;</l>
-  <l i="150">&#x1E4F;</l>
-  <l i="150">&#x1E50;</l>
-  <l i="150">&#x1E51;</l>
-  <l i="150">&#x1E52;</l>
-  <l i="150">&#x1E53;</l>
-  <l i="150">&#x1ECC;</l>
-  <l i="150">&#x1ECD;</l>
-  <l i="150">&#x1ECE;</l>
-  <l i="150">&#x1ECF;</l>
-  <l i="150">&#x1ED0;</l>
-  <l i="150">&#x1ED1;</l>
-  <l i="150">&#x1ED2;</l>
-  <l i="150">&#x1ED3;</l>
-  <l i="150">&#x1ED4;</l>
-  <l i="150">&#x1ED5;</l>
-  <l i="150">&#x1ED6;</l>
-  <l i="150">&#x1ED7;</l>
-  <l i="150">&#x1ED8;</l>
-  <l i="150">&#x1ED9;</l>
-  <l i="150">&#x1EDA;</l>
-  <l i="150">&#x1EDB;</l>
-  <l i="150">&#x1EDC;</l>
-  <l i="150">&#x1EDD;</l>
-  <l i="150">&#x1EDE;</l>
-  <l i="150">&#x1EDF;</l>
-  <l i="150">&#x1EE0;</l>
-  <l i="150">&#x1EE1;</l>
-  <l i="150">&#x1EE2;</l>
-  <l i="150">&#x1EE3;</l>
+  <l i="150">Ò</l>
+  <l i="150">ò</l>
+  <l i="150">Ó</l>
+  <l i="150">ó</l>
+  <l i="150">Ô</l>
+  <l i="150">ô</l>
+  <l i="150">Õ</l>
+  <l i="150">õ</l>
+  <l i="150">Ö</l>
+  <l i="150">ö</l>
+  <l i="150">Ø</l>
+  <l i="150">ø</l>
+  <l i="150">Ō</l>
+  <l i="150">ō</l>
+  <l i="150">Ŏ</l>
+  <l i="150">ŏ</l>
+  <l i="150">Ő</l>
+  <l i="150">ő</l>
+  <l i="150">Ɵ</l>
+  <l i="150">Æ </l>
+  <l i="150">Æ¡</l>
+  <l i="150">Ǒ</l>
+  <l i="150">ǒ</l>
+  <l i="150">Ǫ</l>
+  <l i="150">Ç«</l>
+  <l i="150">Ǭ</l>
+  <l i="150">Ç­</l>
+  <l i="150">Ǿ</l>
+  <l i="150">Ç¿</l>
+  <l i="150">Ȍ</l>
+  <l i="150">ȍ</l>
+  <l i="150">Ȏ</l>
+  <l i="150">ȏ</l>
+  <l i="150">Ȫ</l>
+  <l i="150">È«</l>
+  <l i="150">Ȭ</l>
+  <l i="150">È­</l>
+  <l i="150">È®</l>
+  <l i="150">ȯ</l>
+  <l i="150">È°</l>
+  <l i="150">ȱ</l>
+  <l i="150">Ṍ</l>
+  <l i="150">ṍ</l>
+  <l i="150">Ṏ</l>
+  <l i="150">ṏ</l>
+  <l i="150">Ṑ</l>
+  <l i="150">ṑ</l>
+  <l i="150">Ṓ</l>
+  <l i="150">ṓ</l>
+  <l i="150">Ọ</l>
+  <l i="150">ọ</l>
+  <l i="150">Ỏ</l>
+  <l i="150">ỏ</l>
+  <l i="150">Ố</l>
+  <l i="150">ố</l>
+  <l i="150">Ồ</l>
+  <l i="150">ồ</l>
+  <l i="150">Ổ</l>
+  <l i="150">ổ</l>
+  <l i="150">Ỗ</l>
+  <l i="150">ỗ</l>
+  <l i="150">Ộ</l>
+  <l i="150">ộ</l>
+  <l i="150">Ớ</l>
+  <l i="150">ớ</l>
+  <l i="150">Ờ</l>
+  <l i="150">ờ</l>
+  <l i="150">Ở</l>
+  <l i="150">ở</l>
+  <l i="150">á» </l>
+  <l i="150">ỡ</l>
+  <l i="150">Ợ</l>
+  <l i="150">ợ</l>
   <l i="160">P</l>
   <l i="160">p</l>
-  <l i="160">&#x01A4;</l>
-  <l i="160">&#x01A5;</l>
-  <l i="160">&#x1E54;</l>
-  <l i="160">&#x1E55;</l>
-  <l i="160">&#x1E56;</l>
-  <l i="160">&#x1E57;</l>
+  <l i="160">Ƥ</l>
+  <l i="160">Æ¥</l>
+  <l i="160">Ṕ</l>
+  <l i="160">ṕ</l>
+  <l i="160">Ṗ</l>
+  <l i="160">ṗ</l>
   <l i="170">Q</l>
   <l i="170">q</l>
-  <l i="170">&#x02A0;</l>
+  <l i="170">Ê </l>
   <l i="180">R</l>
   <l i="180">r</l>
-  <l i="180">&#x0154;</l>
-  <l i="180">&#x0155;</l>
-  <l i="180">&#x0156;</l>
-  <l i="180">&#x0157;</l>
-  <l i="180">&#x0158;</l>
-  <l i="180">&#x0159;</l>
-  <l i="180">&#x0210;</l>
-  <l i="180">&#x0211;</l>
-  <l i="180">&#x0212;</l>
-  <l i="180">&#x0213;</l>
-  <l i="180">&#x027C;</l>
-  <l i="180">&#x027D;</l>
-  <l i="180">&#x027E;</l>
-  <l i="180">&#x1E58;</l>
-  <l i="180">&#x1E59;</l>
-  <l i="180">&#x1E5A;</l>
-  <l i="180">&#x1E5B;</l>
-  <l i="180">&#x1E5C;</l>
-  <l i="180">&#x1E5D;</l>
-  <l i="180">&#x1E5E;</l>
-  <l i="180">&#x1E5F;</l>
+  <l i="180">Ŕ</l>
+  <l i="180">ŕ</l>
+  <l i="180">Ŗ</l>
+  <l i="180">ŗ</l>
+  <l i="180">Ř</l>
+  <l i="180">ř</l>
+  <l i="180">Ȑ</l>
+  <l i="180">ȑ</l>
+  <l i="180">Ȓ</l>
+  <l i="180">ȓ</l>
+  <l i="180">ɼ</l>
+  <l i="180">ɽ</l>
+  <l i="180">ɾ</l>
+  <l i="180">Ṙ</l>
+  <l i="180">ṙ</l>
+  <l i="180">Ṛ</l>
+  <l i="180">ṛ</l>
+  <l i="180">Ṝ</l>
+  <l i="180">ṝ</l>
+  <l i="180">Ṟ</l>
+  <l i="180">ṟ</l>
   <l i="190">S</l>
   <l i="190">s</l>
-  <l i="190">&#x015A;</l>
-  <l i="190">&#x015B;</l>
-  <l i="190">&#x015C;</l>
-  <l i="190">&#x015D;</l>
-  <l i="190">&#x015E;</l>
-  <l i="190">&#x015F;</l>
-  <l i="190">&#x0160;</l>
-  <l i="190">&#x0161;</l>
-  <l i="190">&#x0218;</l>
-  <l i="190">&#x0219;</l>
-  <l i="190">&#x0282;</l>
-  <l i="190">&#x1E60;</l>
-  <l i="190">&#x1E61;</l>
-  <l i="190">&#x1E62;</l>
-  <l i="190">&#x1E63;</l>
-  <l i="190">&#x1E64;</l>
-  <l i="190">&#x1E65;</l>
-  <l i="190">&#x1E66;</l>
-  <l i="190">&#x1E67;</l>
-  <l i="190">&#x1E68;</l>
-  <l i="190">&#x1E69;</l>
+  <l i="190">Ś</l>
+  <l i="190">ś</l>
+  <l i="190">Ŝ</l>
+  <l i="190">ŝ</l>
+  <l i="190">Ş</l>
+  <l i="190">ş</l>
+  <l i="190">Å </l>
+  <l i="190">Å¡</l>
+  <l i="190">Ș</l>
+  <l i="190">ș</l>
+  <l i="190">ʂ</l>
+  <l i="190">á¹ </l>
+  <l i="190">ṡ</l>
+  <l i="190">á¹¢</l>
+  <l i="190">á¹£</l>
+  <l i="190">Ṥ</l>
+  <l i="190">á¹¥</l>
+  <l i="190">Ṧ</l>
+  <l i="190">ṧ</l>
+  <l i="190">Ṩ</l>
+  <l i="190">ṩ</l>
   <l i="200">T</l>
   <l i="200">t</l>
-  <l i="200">&#x0162;</l>
-  <l i="200">&#x0163;</l>
-  <l i="200">&#x0164;</l>
-  <l i="200">&#x0165;</l>
-  <l i="200">&#x0166;</l>
-  <l i="200">&#x0167;</l>
-  <l i="200">&#x01AB;</l>
-  <l i="200">&#x01AC;</l>
-  <l i="200">&#x01AD;</l>
-  <l i="200">&#x01AE;</l>
-  <l i="200">&#x0288;</l>
-  <l i="200">&#x021A;</l>
-  <l i="200">&#x021B;</l>
-  <l i="200">&#x0236;</l>
-  <l i="200">&#x1E6A;</l>
-  <l i="200">&#x1E6B;</l>
-  <l i="200">&#x1E6C;</l>
-  <l i="200">&#x1E6D;</l>
-  <l i="200">&#x1E6E;</l>
-  <l i="200">&#x1E6F;</l>
-  <l i="200">&#x1E70;</l>
-  <l i="200">&#x1E71;</l>
-  <l i="200">&#x1E97;</l>
+  <l i="200">Å¢</l>
+  <l i="200">Å£</l>
+  <l i="200">Ť</l>
+  <l i="200">Å¥</l>
+  <l i="200">Ŧ</l>
+  <l i="200">ŧ</l>
+  <l i="200">Æ«</l>
+  <l i="200">Ƭ</l>
+  <l i="200">Æ­</l>
+  <l i="200">Æ®</l>
+  <l i="200">ʈ</l>
+  <l i="200">Ț</l>
+  <l i="200">ț</l>
+  <l i="200">ȶ</l>
+  <l i="200">Ṫ</l>
+  <l i="200">ṫ</l>
+  <l i="200">Ṭ</l>
+  <l i="200">á¹­</l>
+  <l i="200">á¹®</l>
+  <l i="200">ṯ</l>
+  <l i="200">á¹°</l>
+  <l i="200">á¹±</l>
+  <l i="200">ẗ</l>
   <l i="210">U</l>
   <l i="210">u</l>
-  <l i="210">&#x00D9;</l>
-  <l i="210">&#x00F9;</l>
-  <l i="210">&#x00DA;</l>
-  <l i="210">&#x00FA;</l>
-  <l i="210">&#x00DB;</l>
-  <l i="210">&#x00FB;</l>
-  <l i="210">&#x00DC;</l>
-  <l i="210">&#x00FC;</l>
-  <l i="210">&#x0168;</l>
-  <l i="210">&#x0169;</l>
-  <l i="210">&#x016A;</l>
-  <l i="210">&#x016B;</l>
-  <l i="210">&#x016C;</l>
-  <l i="210">&#x016D;</l>
-  <l i="210">&#x016E;</l>
-  <l i="210">&#x016F;</l>
-  <l i="210">&#x0170;</l>
-  <l i="210">&#x0171;</l>
-  <l i="210">&#x0172;</l>
-  <l i="210">&#x0173;</l>
-  <l i="210">&#x01AF;</l>
-  <l i="210">&#x01B0;</l>
-  <l i="210">&#x01D3;</l>
-  <l i="210">&#x01D4;</l>
-  <l i="210">&#x01D5;</l>
-  <l i="210">&#x01D6;</l>
-  <l i="210">&#x01D7;</l>
-  <l i="210">&#x01D8;</l>
-  <l i="210">&#x01D9;</l>
-  <l i="210">&#x01DA;</l>
-  <l i="210">&#x01DB;</l>
-  <l i="210">&#x01DC;</l>
-  <l i="210">&#x0214;</l>
-  <l i="210">&#x0215;</l>
-  <l i="210">&#x0216;</l>
-  <l i="210">&#x0217;</l>
-  <l i="210">&#x1E72;</l>
-  <l i="210">&#x1E73;</l>
-  <l i="210">&#x1E74;</l>
-  <l i="210">&#x1E75;</l>
-  <l i="210">&#x1E76;</l>
-  <l i="210">&#x1E77;</l>
-  <l i="210">&#x1E78;</l>
-  <l i="210">&#x1E79;</l>
-  <l i="210">&#x1E7A;</l>
-  <l i="210">&#x1E7B;</l>
-  <l i="210">&#x1EE4;</l>
-  <l i="210">&#x1EE5;</l>
-  <l i="210">&#x1EE6;</l>
-  <l i="210">&#x1EE7;</l>
-  <l i="210">&#x1EE8;</l>
-  <l i="210">&#x1EE9;</l>
-  <l i="210">&#x1EEA;</l>
-  <l i="210">&#x1EEB;</l>
-  <l i="210">&#x1EEC;</l>
-  <l i="210">&#x1EED;</l>
-  <l i="210">&#x1EEE;</l>
-  <l i="210">&#x1EEF;</l>
-  <l i="210">&#x1EF0;</l>
-  <l i="210">&#x1EF1;</l>
+  <l i="210">Ù</l>
+  <l i="210">ù</l>
+  <l i="210">Ú</l>
+  <l i="210">ú</l>
+  <l i="210">Û</l>
+  <l i="210">û</l>
+  <l i="210">Ü</l>
+  <l i="210">ü</l>
+  <l i="210">Ũ</l>
+  <l i="210">Å©</l>
+  <l i="210">Ū</l>
+  <l i="210">Å«</l>
+  <l i="210">Ŭ</l>
+  <l i="210">Å­</l>
+  <l i="210">Å®</l>
+  <l i="210">ů</l>
+  <l i="210">Å°</l>
+  <l i="210">ű</l>
+  <l i="210">Ų</l>
+  <l i="210">ų</l>
+  <l i="210">Ư</l>
+  <l i="210">Æ°</l>
+  <l i="210">Ǔ</l>
+  <l i="210">ǔ</l>
+  <l i="210">Ǖ</l>
+  <l i="210">ǖ</l>
+  <l i="210">Ǘ</l>
+  <l i="210">ǘ</l>
+  <l i="210">Ǚ</l>
+  <l i="210">ǚ</l>
+  <l i="210">Ǜ</l>
+  <l i="210">ǜ</l>
+  <l i="210">Ȕ</l>
+  <l i="210">ȕ</l>
+  <l i="210">Ȗ</l>
+  <l i="210">ȗ</l>
+  <l i="210">á¹²</l>
+  <l i="210">á¹³</l>
+  <l i="210">á¹´</l>
+  <l i="210">á¹µ</l>
+  <l i="210">Ṷ</l>
+  <l i="210">á¹·</l>
+  <l i="210">Ṹ</l>
+  <l i="210">á¹¹</l>
+  <l i="210">Ṻ</l>
+  <l i="210">á¹»</l>
+  <l i="210">Ụ</l>
+  <l i="210">ụ</l>
+  <l i="210">Ủ</l>
+  <l i="210">ủ</l>
+  <l i="210">Ứ</l>
+  <l i="210">ứ</l>
+  <l i="210">Ừ</l>
+  <l i="210">ừ</l>
+  <l i="210">Ử</l>
+  <l i="210">á»­</l>
+  <l i="210">á»®</l>
+  <l i="210">ữ</l>
+  <l i="210">á»°</l>
+  <l i="210">á»±</l>
   <l i="220">V</l>
   <l i="220">v</l>
-  <l i="220">&#x01B2;</l>
-  <l i="220">&#x028B;</l>
-  <l i="220">&#x1E7C;</l>
-  <l i="220">&#x1E7D;</l>
-  <l i="220">&#x1E7E;</l>
-  <l i="220">&#x1E7F;</l>
+  <l i="220">Ʋ</l>
+  <l i="220">ʋ</l>
+  <l i="220">á¹¼</l>
+  <l i="220">á¹½</l>
+  <l i="220">á¹¾</l>
+  <l i="220">ṿ</l>
   <l i="230">W</l>
   <l i="230">w</l>
-  <l i="230">&#x0174;</l>
-  <l i="230">&#x0175;</l>
-  <l i="230">&#x1E80;</l>
-  <l i="230">&#x1E81;</l>
-  <l i="230">&#x1E82;</l>
-  <l i="230">&#x1E83;</l>
-  <l i="230">&#x1E84;</l>
-  <l i="230">&#x1E85;</l>
-  <l i="230">&#x1E86;</l>
-  <l i="230">&#x1E87;</l>
-  <l i="230">&#x1E88;</l>
-  <l i="230">&#x1E89;</l>
-  <l i="230">&#x1E98;</l>
+  <l i="230">Å´</l>
+  <l i="230">ŵ</l>
+  <l i="230">Ẁ</l>
+  <l i="230">ẁ</l>
+  <l i="230">Ẃ</l>
+  <l i="230">ẃ</l>
+  <l i="230">Ẅ</l>
+  <l i="230">ẅ</l>
+  <l i="230">Ẇ</l>
+  <l i="230">ẇ</l>
+  <l i="230">Ẉ</l>
+  <l i="230">ẉ</l>
+  <l i="230">ẘ</l>
   <l i="240">X</l>
   <l i="240">x</l>
-  <l i="240">&#x1E8A;</l>
-  <l i="240">&#x1E8B;</l>
-  <l i="240">&#x1E8C;</l>
-  <l i="240">&#x1E8D;</l>
+  <l i="240">Ẋ</l>
+  <l i="240">ẋ</l>
+  <l i="240">Ẍ</l>
+  <l i="240">ẍ</l>
   <l i="250">Y</l>
   <l i="250">y</l>
-  <l i="250">&#x00DD;</l>
-  <l i="250">&#x00FD;</l>
-  <l i="250">&#x00FF;</l>
-  <l i="250">&#x0178;</l>
-  <l i="250">&#x0176;</l>
-  <l i="250">&#x0177;</l>
-  <l i="250">&#x01B3;</l>
-  <l i="250">&#x01B4;</l>
-  <l i="250">&#x0232;</l>
-  <l i="250">&#x0233;</l>
-  <l i="250">&#x1E8E;</l>
-  <l i="250">&#x1E8F;</l>
-  <l i="250">&#x1E99;</l>
-  <l i="250">&#x1EF2;</l>
-  <l i="250">&#x1EF3;</l>
-  <l i="250">&#x1EF4;</l>
-  <l i="250">&#x1EF5;</l>
-  <l i="250">&#x1EF6;</l>
-  <l i="250">&#x1EF7;</l>
-  <l i="250">&#x1EF8;</l>
-  <l i="250">&#x1EF9;</l>
+  <l i="250">Ý</l>
+  <l i="250">ý</l>
+  <l i="250">ÿ</l>
+  <l i="250">Ÿ</l>
+  <l i="250">Ŷ</l>
+  <l i="250">Å·</l>
+  <l i="250">Ƴ</l>
+  <l i="250">Æ´</l>
+  <l i="250">Ȳ</l>
+  <l i="250">ȳ</l>
+  <l i="250">Ẏ</l>
+  <l i="250">ẏ</l>
+  <l i="250">ẙ</l>
+  <l i="250">Ỳ</l>
+  <l i="250">ỳ</l>
+  <l i="250">á»´</l>
+  <l i="250">ỵ</l>
+  <l i="250">Ỷ</l>
+  <l i="250">á»·</l>
+  <l i="250">Ỹ</l>
+  <l i="250">ỹ</l>
   <l i="260">Z</l>
   <l i="260">z</l>
-  <l i="260">&#x0179;</l>
-  <l i="260">&#x017A;</l>
-  <l i="260">&#x017B;</l>
-  <l i="260">&#x017C;</l>
-  <l i="260">&#x017D;</l>
-  <l i="260">&#x017E;</l>
-  <l i="260">&#x01B5;</l>
-  <l i="260">&#x01B6;</l>
-  <l i="260">&#x0224;</l>
-  <l i="260">&#x0225;</l>
-  <l i="260">&#x0290;</l>
-  <l i="260">&#x0291;</l>
-  <l i="260">&#x1E90;</l>
-  <l i="260">&#x1E91;</l>
-  <l i="260">&#x1E92;</l>
-  <l i="260">&#x1E93;</l>
-  <l i="260">&#x1E94;</l>
-  <l i="260">&#x1E95;</l>
+  <l i="260">Ź</l>
+  <l i="260">ź</l>
+  <l i="260">Å»</l>
+  <l i="260">ż</l>
+  <l i="260">Ž</l>
+  <l i="260">ž</l>
+  <l i="260">Ƶ</l>
+  <l i="260">ƶ</l>
+  <l i="260">Ȥ</l>
+  <l i="260">È¥</l>
+  <l i="260">ʐ</l>
+  <l i="260">ʑ</l>
+  <l i="260">Ẑ</l>
+  <l i="260">ẑ</l>
+  <l i="260">Ẓ</l>
+  <l i="260">ẓ</l>
+  <l i="260">Ẕ</l>
+  <l i="260">ẕ</l>
 </letters>
 
 </locale>
diff --git a/gentext/locale/es.xml b/gentext/locale/es.xml
index b42bd3209..5195396aa 100644
--- a/gentext/locale/es.xml
+++ b/gentext/locale/es.xml
@@ -1,17 +1,12 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-]>
 <locale language="es"
         english-language-name="Spanish"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
-  <author><firstname>Antonio Larrosa</firstname><surname>Jim&#233;nez</surname>
+  <author><firstname>Antonio Larrosa</firstname><surname>Jiménez</surname>
           <affiliation><address><email>larrosa@kde.org</email></address>
           </affiliation>
   </author>
@@ -22,30 +17,30 @@
 <gentext key="abstract" text="resumen"/>
 <gentext key="Answer" text="R:"/>
 <gentext key="answer" text="r:"/>
-<gentext key="Appendix" text="Ap&eacute;ndice"/>
-<gentext key="appendix" text="ap&eacute;ndice"/>
-<gentext key="Article" text="Art&iacute;culo"/>
-<gentext key="article" text="art&iacute;culo"/>
+<gentext key="Appendix" text="Apéndice"/>
+<gentext key="appendix" text="apéndice"/>
+<gentext key="Article" text="Artículo"/>
+<gentext key="article" text="artículo"/>
 <gentext key="Author" text="Autor"/>
-<gentext key="Bibliography" text="Bibliograf&iacute;a"/>
-<gentext key="bibliography" text="bibliograf&iacute;a"/>
+<gentext key="Bibliography" text="Bibliografía"/>
+<gentext key="bibliography" text="bibliografía"/>
 <gentext key="Book" text="Libro"/>
 <gentext key="book" text="libro"/>
-<gentext key="CAUTION" text="ATENCI&Oacute;N"/>
-<gentext key="Caution" text="Atenci&oacute;n"/>
-<gentext key="caution" text="atenci&oacute;n"/>
-<gentext key="Chapter" text="Cap&iacute;tulo"/>
-<gentext key="chapter" text="cap&iacute;tulo"/>
-<gentext key="Colophon" text="Colof&oacute;n"/>
-<gentext key="colophon" text="colof&oacute;n"/>
+<gentext key="CAUTION" text="ATENCIÓN"/>
+<gentext key="Caution" text="Atención"/>
+<gentext key="caution" text="atención"/>
+<gentext key="Chapter" text="Capítulo"/>
+<gentext key="chapter" text="capítulo"/>
+<gentext key="Colophon" text="Colofón"/>
+<gentext key="colophon" text="colofón"/>
 <gentext key="Copyright" text="Copyright"/>
 <gentext key="copyright" text="copyright"/>
 <gentext key="Dedication" text="Dedicatoria"/>
 <gentext key="dedication" text="dedicatoria"/>
-<gentext key="Edition" text="Edici&oacute;n"/>
-<gentext key="edition" text="edici&oacute;n"/>
-<gentext key="Equation" text="Ecuaci&oacute;n"/>
-<gentext key="equation" text="ecuaci&oacute;n"/>
+<gentext key="Edition" text="Edición"/>
+<gentext key="edition" text="edición"/>
+<gentext key="Equation" text="Ecuación"/>
+<gentext key="equation" text="ecuación"/>
 <gentext key="Example" text="Ejemplo"/>
 <gentext key="example" text="ejemplo"/>
 <gentext key="Figure" text="Figura"/>
@@ -54,13 +49,13 @@
 <gentext key="glossary" text="glosario"/>
 <gentext key="GlossSee" text="Ver"/>
 <gentext key="glosssee" text="ver"/>
-<gentext key="GlossSeeAlso" text="Ver tambi&eacute;n"/>
-<gentext key="glossseealso" text="ver tambi&eacute;n"/>
+<gentext key="GlossSeeAlso" text="Ver también"/>
+<gentext key="glossseealso" text="ver también"/>
 <gentext key="IMPORTANT" text="IMPORTANTE"/>
 <gentext key="Important" text="Importante"/>
 <gentext key="important" text="importante"/>
-<gentext key="Index" text="&Iacute;ndice"/>
-<gentext key="index" text="&iacute;ndice"/>
+<gentext key="Index" text="Índice"/>
+<gentext key="index" text="índice"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="isbn"/>
 <gentext key="LegalNotice" text="Aviso Legal"/>
@@ -80,9 +75,9 @@
 <gentext key="preface" text="prefacio"/>
 <gentext key="Procedure" text="Procedimiento"/>
 <gentext key="procedure" text="procedimiento"/>
-<gentext key="ProductionSet" text="Producci&#243;n"/>
-<gentext key="PubDate" text="Fecha de publicaci&oacute;n"/>
-<gentext key="pubdate" text="fecha de publicaci&oacute;n"/>
+<gentext key="ProductionSet" text="Producción"/>
+<gentext key="PubDate" text="Fecha de publicación"/>
+<gentext key="pubdate" text="fecha de publicación"/>
 <gentext key="Published" text="Publicado"/>
 <gentext key="published" text="publicado"/>
 <gentext key="Qandadiv" text="P y R"/>
@@ -95,30 +90,30 @@
 <gentext key="reference" text="referencia"/>
 <gentext key="RefName" text="Nombre de referencia"/>
 <gentext key="refname" text="nombre de referencia"/>
-<gentext key="RefSection" text="Secci&oacute;n de referencia"/>
-<gentext key="refsection" text="secci&oacute;n de referencia"/>
+<gentext key="RefSection" text="Sección de referencia"/>
+<gentext key="refsection" text="sección de referencia"/>
 <gentext key="RefSynopsisDiv" text="Sinopsis"/>
 <gentext key="refsynopsisdiv" text="sinopsis"/>
 <gentext key="RevHistory" text="Historial de revisiones"/>
 <gentext key="revhistory" text="Historial de revisiones"/>
-<gentext key="Revision" text="Revisi&oacute;n"/>
-<gentext key="revision" text="revisi&oacute;n"/>
-<gentext key="sect1" text="Secci&oacute;n"/>
-<gentext key="sect2" text="Secci&oacute;n"/>
-<gentext key="sect3" text="Secci&oacute;n"/>
-<gentext key="sect4" text="Secci&oacute;n"/>
-<gentext key="sect5" text="Secci&oacute;n"/> 
-<gentext key="Section" text="Secci&oacute;n"/>
-<gentext key="section" text="secci&oacute;n"/>
+<gentext key="Revision" text="Revisión"/>
+<gentext key="revision" text="revisión"/>
+<gentext key="sect1" text="Sección"/>
+<gentext key="sect2" text="Sección"/>
+<gentext key="sect3" text="Sección"/>
+<gentext key="sect4" text="Sección"/>
+<gentext key="sect5" text="Sección"/> 
+<gentext key="Section" text="Sección"/>
+<gentext key="section" text="sección"/>
 <gentext key="See" text="Ver"/>
 <gentext key="see" text="ver"/>
-<gentext key="SeeAlso" text="Ver Tambi&eacute;n"/>
-<gentext key="Seealso" text="Ver tambi&eacute;n"/>
-<gentext key="seealso" text="ver tambi&eacute;n"/>
+<gentext key="SeeAlso" text="Ver También"/>
+<gentext key="Seealso" text="Ver también"/>
+<gentext key="seealso" text="ver también"/>
 <gentext key="Set" text="Conjunto"/>
 <gentext key="set" text="conjunto"/>
-<gentext key="SetIndex" text="&Iacute;ndice del Conjunto"/>
-<gentext key="setindex" text="&iacute;ndice del conjunto"/>
+<gentext key="SetIndex" text="Índice del Conjunto"/>
+<gentext key="setindex" text="índice del conjunto"/>
 <gentext key="Sidebar" text="Barra lateral"/>
 <gentext key="sidebar" text="barra lateral"/>
 <gentext key="Step" text="Paso"/>
@@ -144,8 +139,8 @@
 <gentext key="nonexistantelement" text="elemento inexistente"/>
 <gentext key="notes" text="notas"/>
 <gentext key="Notes" text="Notas"/>
-<gentext key="Pgs" text="P&aacute;gs."/>
-<gentext key="pgs" text="p&aacute;gs."/>
+<gentext key="Pgs" text="Págs."/>
+<gentext key="pgs" text="págs."/>
 <gentext key="Revisedby" text="Revisado por: "/>
 <gentext key="revisedby" text="revisado por: "/>
 <gentext key="TableNotes" text="Notas de tabla"/>
@@ -174,20 +169,20 @@
 <gentext key="nav-prev-sibling" text="Retroceder"/>
 <gentext key="nav-up" text="Subir"/>
 
-<gentext key="index symbols" text="S&#237;mbolos"/>
-<gentext key="Draft"         text="Borrador"/>
-<gentext key="above"         text="arriba"/>
-<gentext key="below"         text="abajo"/>
-<gentext key="sectioncalled" text="secci&#243;n llamada"/>
+<gentext key="index symbols" text="Símbolos"/>
+<gentext key="Draft" text="Borrador"/>
+<gentext key="above" text="arriba"/>
+<gentext key="below" text="abajo"/>
+<gentext key="sectioncalled" text="sección llamada"/>
 
-<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz&aacute;&eacute;&iacute;&oacute;&uacute;&ntilde;"/> 
-<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ&Aacute;&Eacute;&Iacute;&Oacute;&Uacute;&Ntilde;"/>
+<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzáéíóúñ"/> 
+<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÁÉÍÓÚÑ"/>
 
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
diff --git a/gentext/locale/fr.xml b/gentext/locale/fr.xml
index 2b865f5ff..7ccc42030 100644
--- a/gentext/locale/fr.xml
+++ b/gentext/locale/fr.xml
@@ -1,18 +1,10 @@
-<?xml version='1.0' encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-<!ENTITY % lat2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat2.ent">
-%lat2;
-]>
 <locale language="fr"
         english-language-name="French"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
   <author><firstname>Sylvain</firstname><surname>Amrani</surname>
   </author>
@@ -22,8 +14,8 @@
 </authorgroup>
 </doc:localeinfo>
 
-<gentext key="Abstract" text="R&eacute;sum&eacute;"/>
-<gentext key="abstract" text="R&eacute;sum&eacute;"/>
+<gentext key="Abstract" text="Résumé"/>
+<gentext key="abstract" text="Résumé"/>
 <gentext key="Answer" text="R&#x00A0;:"/>
 <gentext key="answer" text="R&#x00A0;:"/>
 <gentext key="Appendix" text="Annexe"/>
@@ -40,16 +32,16 @@
 <gentext key="CAUTION" text="ATTENTION"/>
 <gentext key="Chapter" text="Chapitre"/>
 <gentext key="chapter" text="chapitre"/>
-<gentext key="Colophon" text="Achev&eacute; d'imprimer"/>
-<gentext key="colophon" text="Achev&eacute; d'imprimer"/>
+<gentext key="Colophon" text="Achevé d'imprimer"/>
+<gentext key="colophon" text="Achevé d'imprimer"/>
 <gentext key="Copyright" text="Copyright"/>
 <gentext key="copyright" text="Copyright"/>
-<gentext key="Dedication" text="D&eacute;dicace"/>
-<gentext key="dedication" text="D&eacute;dicace"/>
-<gentext key="Edition" text="&Eacute;dition"/>
-<gentext key="edition" text="&Eacute;dition"/>
-<gentext key="Equation" text="&Eacute;quation"/>
-<gentext key="equation" text="&Eacute;quation"/>
+<gentext key="Dedication" text="Dédicace"/>
+<gentext key="dedication" text="Dédicace"/>
+<gentext key="Edition" text="Édition"/>
+<gentext key="edition" text="Édition"/>
+<gentext key="Equation" text="Équation"/>
+<gentext key="equation" text="Équation"/>
 <gentext key="Example" text="Exemple"/>
 <gentext key="example" text="Exemple"/>
 <gentext key="Figure" text="Figure"/>
@@ -67,10 +59,10 @@
 <gentext key="index" text="Index"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="ISBN"/>
-<gentext key="LegalNotice" text="Note l&eacute;gale"/>
-<gentext key="legalnotice" text="Note l&eacute;gale"/>
-<gentext key="MsgAud" text="Public vis&eacute;"/>
-<gentext key="msgaud" text="Public vis&eacute;"/>
+<gentext key="LegalNotice" text="Note légale"/>
+<gentext key="legalnotice" text="Note légale"/>
+<gentext key="MsgAud" text="Public visé"/>
+<gentext key="msgaud" text="Public visé"/>
 <gentext key="MsgLevel" text="Niveau"/>
 <gentext key="msglevel" text="Niveau"/>
 <gentext key="MsgOrig" text="Origine"/>
@@ -80,23 +72,23 @@
 <gentext key="note" text="Note"/>
 <gentext key="Part" text="Partie"/>
 <gentext key="part" text="Partie"/>
-<gentext key="Preface" text="Pr&eacute;face"/>
-<gentext key="preface" text="Pr&eacute;face"/>
-<gentext key="Procedure" text="Proc&eacute;dure"/>
-<gentext key="procedure" text="Proc&eacute;dure"/>
+<gentext key="Preface" text="Préface"/>
+<gentext key="preface" text="Préface"/>
+<gentext key="Procedure" text="Procédure"/>
+<gentext key="procedure" text="Procédure"/>
 <gentext key="ProductionSet" text="Production"/>
 <gentext key="PubDate" text="Date de publication"/>
 <gentext key="pubdate" text="Date de publication"/>
-<gentext key="Published" text="Publi&eacute; le"/>
-<gentext key="published" text="Publi&eacute; le"/>
+<gentext key="Published" text="Publié le"/>
+<gentext key="published" text="Publié le"/>
 <gentext key="Qandadiv" text="Q &amp; R"/>
 <gentext key="qandadiv" text="Q &amp; R"/>
 <gentext key="Question" text="Q&#x00A0;:"/>
 <gentext key="question" text="Q&#x00A0;:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="Reference" text="R&eacute;f&eacute;rence"/>
-<gentext key="reference" text="R&eacute;f&eacute;rence"/>
+<gentext key="Reference" text="Référence"/>
+<gentext key="reference" text="Référence"/>
 <gentext key="RefName" text="Nom"/>
 <gentext key="refname" text="Nom"/>
 <gentext key="RefSection" text=""/>
@@ -125,8 +117,8 @@
 <gentext key="SetIndex" text="Index"/>
 <gentext key="Sidebar" text="Filet vertical"/>
 <gentext key="sidebar" text="Filet vertical"/>
-<gentext key="step" text="&eacute;tape"/>
-<gentext key="Step" text="&Eacute;tape"/>
+<gentext key="step" text="étape"/>
+<gentext key="Step" text="Étape"/>
 <gentext key="Table" text="Tableau"/>
 <gentext key="table" text="Tableau"/>
 <gentext key="tip" text="ASTUCE"/>
@@ -138,38 +130,38 @@
 
 <gentext key="and" text="et"/>
 <gentext key="by" text="par"/>
-<gentext key="called" text="intitul&eacute;"/>
-<gentext key="Edited" text="Publi&eacute;"/>
-<gentext key="edited" text="Publi&eacute;"/>
-<gentext key="Editedby" text="Publi&eacute; par"/>
-<gentext key="editedby" text="Publi&eacute; par"/>
+<gentext key="called" text="intitulé"/>
+<gentext key="Edited" text="Publié"/>
+<gentext key="edited" text="Publié"/>
+<gentext key="Editedby" text="Publié par"/>
+<gentext key="editedby" text="Publié par"/>
 <gentext key="in" text="dans"/>
 <gentext key="lastlistcomma" text=","/>
 <gentext key="listcomma" text=","/>
-<gentext key="nonexistantelement" text="Cet &eacute;l&eacute;ment n'existe pas"/>
+<gentext key="nonexistantelement" text="Cet élément n'existe pas"/>
 <gentext key="notes" text="Notes"/>
 <gentext key="Notes" text="Notes"/>
 <gentext key="Pgs" text="Pages"/>
 <gentext key="pgs" text="Pages"/>
-<gentext key="Revisedby" text="Revu et corrig&eacute; par&#x00A0;: "/>
-<gentext key="revisedby" text="Revu et corrig&eacute; par&#x00A0;: "/>
+<gentext key="Revisedby" text="Revu et corrigé par&#x00A0;: "/>
+<gentext key="revisedby" text="Revu et corrigé par&#x00A0;: "/>
 <gentext key="TableNotes" text="Remarques"/>
 <gentext key="tablenotes" text="Remarques"/>
-<gentext key="TableofContents" text="Table des mati&egrave;res"/>
-<gentext key="tableofcontents" text="Table des mati&egrave;res"/>
+<gentext key="TableofContents" text="Table des matières"/>
+<gentext key="tableofcontents" text="Table des matières"/>
 <gentext key="the" text=""/>
-<gentext key="unexpectedelementname" text="Nom d'&eacute;l&eacute;ment inattendu"/>
-<gentext key="unsupported" text="Non reconnu par le syst&egrave;me"/>
-<gentext key="xrefto" text="R&eacute;f&eacute;rence vers"/>
+<gentext key="unexpectedelementname" text="Nom d'élément inattendu"/>
+<gentext key="unsupported" text="Non reconnu par le système"/>
+<gentext key="xrefto" text="Référence vers"/>
 
-<gentext key="listofequations" text="Liste des &eacute;quations"/>
-<gentext key="ListofEquations" text="Liste des &eacute;quations"/>
+<gentext key="listofequations" text="Liste des équations"/>
+<gentext key="ListofEquations" text="Liste des équations"/>
 <gentext key="ListofExamples" text="Liste des exemples"/>
 <gentext key="listofexamples" text="Liste des exemples"/>
 <gentext key="ListofFigures" text="Liste des illustrations"/>
 <gentext key="listoffigures" text="Liste des illustrations"/>
-<gentext key="ListofProcedures" text="Liste des proc&eacute;dures"/>
-<gentext key="listofprocedures" text="Liste des proc&eacute;dures"/>
+<gentext key="ListofProcedures" text="Liste des procédures"/>
+<gentext key="listofprocedures" text="Liste des procédures"/>
 <gentext key="listoftables" text="Liste des tableaux"/>
 <gentext key="ListofTables" text="Liste des tableaux"/>
 <gentext key="ListofUnknown" text="Liste inconnue"/>
@@ -178,28 +170,28 @@
 <gentext key="nav-home" text="Sommaire"/>
 <gentext key="nav-next" text="Suivant"/>
 <gentext key="nav-next-sibling" text="Avance rapide"/>
-<gentext key="nav-prev" text="Pr&#x00E9;c&#x00E9;dent"/>
-<gentext key="nav-prev-sibling" text="Arri&#xE8;re rapide"/>
-<gentext key="nav-up" text="Niveau sup&#x00E9;rieur"/>
+<gentext key="nav-prev" text="Précédent"/>
+<gentext key="nav-prev-sibling" text="Arrière rapide"/>
+<gentext key="nav-up" text="Niveau supérieur"/>
 <gentext key="nav-toc" text="TdM"/>
 
-<gentext key="Draft"         text="Brouillon"/>
-<gentext key="above"         text="au-dessus"/>
-<gentext key="below"         text="au-dessous"/>
-<gentext key="sectioncalled" text="la section intitul&eacute;e" />
+<gentext key="Draft" text="Brouillon"/>
+<gentext key="above" text="au-dessus"/>
+<gentext key="below" text="au-dessous"/>
+<gentext key="sectioncalled" text="la section intitulée"/>
 <gentext key="index symbols" text="Symboles"/>
 
-<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz&acirc;&ecirc;&icirc;&ocirc;&ucirc;&euml;&iuml;&uuml;&agrave;&egrave;&ugrave;&eacute;&ccedil;&aelig;&oelig;"/>
-<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ&Acirc;&Ecirc;&Icirc;&Ocirc;&Ucirc;&Euml;&Iuml;&Uuml;&Agrave;&Egrave;&Ugrave;&Eacute;&Ccedil;&AElig;&OElig;"/>
+<gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzâêîôûëïüàèùéçæœ"/>
+<gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÂÊÎÔÛËÏÜÀÈÙÉÇÆŒ"/>
 
-<dingbat key="startquote" text="&#x00AB;&#x00A0;"/>
-<dingbat key="endquote" text="&#x00A0;&#x00BB;"/>
-<dingbat key="nestedstartquote" text="&#x201C;"/>
-<dingbat key="nestedendquote" text="&#x201D;"/>
-<dingbat key="singlestartquote" text="&#x2039;"/>
-<dingbat key="singleendquote" text="&#x203A;"/>
+<dingbat key="startquote" text="«&#x00A0;"/>
+<dingbat key="endquote" text="&#x00A0;»"/>
+<dingbat key="nestedstartquote" text="“"/>
+<dingbat key="nestedendquote" text="”"/>
+<dingbat key="singlestartquote" text="‹"/>
+<dingbat key="singleendquote" text="›"/>
 
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="bullet" text="•"/>
 
 <!-- n.b. &#x2010; serait sans doute mieux, mais il n'est pas toujours -->
 <!-- affiche correctement -->
@@ -520,17 +512,17 @@
 
 <context name="datetime-full">
 <template name="January">janvier</template>
-<template name="February">f&eacute;vrier</template>
+<template name="February">février</template>
 <template name="March">mars</template>
 <template name="April">avril</template>
 <template name="May">mai</template>
 <template name="June">juin</template>
 <template name="July">juillet</template>
-<template name="August">ao&ucirc;t</template>
+<template name="August">août</template>
 <template name="September">septembre</template>
 <template name="October">octobre</template>
 <template name="November">novembre</template>
-<template name="December">d&eacute;cembre</template>
+<template name="December">décembre</template>
 <template name="Monday">lundi</template>
 <template name="Tuesday">mardi</template>
 <template name="Wednesday">mercredi</template>
@@ -542,17 +534,17 @@
 
 <context name="datetime-abbrev">
 <template name="Jan">jan</template>
-<template name="Feb">f&eacute;v</template>
+<template name="Feb">fév</template>
 <template name="Mar">mar</template>
 <template name="Apr">avr</template>
 <template name="May">mai</template>
 <template name="Jun">jun</template>
 <template name="Jul">jui</template>
-<template name="Aug">ao&ucirc;</template>
+<template name="Aug">aoû</template>
 <template name="Sep">sep</template>
 <template name="Oct">oct</template>
 <template name="Nov">nov</template>
-<template name="Dec">d&eacute;c</template>
+<template name="Dec">déc</template>
 <template name="Mon">lun</template>
 <template name="Tue">mar</template>
 <template name="Wed">mer</template>
diff --git a/gentext/locale/hu.xml b/gentext/locale/hu.xml
index 0e800be8e..6b0d91074 100644
--- a/gentext/locale/hu.xml
+++ b/gentext/locale/hu.xml
@@ -1,15 +1,10 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-]>
 <locale language="hu"
         english-language-name="Hungarian"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
   <author><firstname>Tamas</firstname><surname>Szanto</surname>
           <affiliation><address><email>tszanto@mol.hu</email></address>
@@ -22,85 +17,85 @@
 <gentext key="abstract" text="kivonat"/>
 <gentext key="Answer" text="V:"/>
 <gentext key="answer" text="v:"/>
-<gentext key="Appendix" text="F&#x00FC;ggel&#x00E9;k"/>
-<gentext key="appendix" text="f&#x00FC;ggel&#x00E9;k"/>
+<gentext key="Appendix" text="Függelék"/>
+<gentext key="appendix" text="függelék"/>
 <gentext key="Article" text="Cikk"/>
 <gentext key="article" text="cikk"/>
 <gentext key="Author" text="Szerz"/>
-<gentext key="Bibliography" text="Irodalomjegyz&#x00E9;k"/>
-<gentext key="bibliography" text="irodalomjegyz&#x00E9;k"/>
-<gentext key="Book" text="K&#x00F6;nyv"/>
-<gentext key="book" text="k&#x00F6;nyv"/>
+<gentext key="Bibliography" text="Irodalomjegyzék"/>
+<gentext key="bibliography" text="irodalomjegyzék"/>
+<gentext key="Book" text="Könyv"/>
+<gentext key="book" text="könyv"/>
 <gentext key="CAUTION" text="FIGYELEM"/>
 <gentext key="Caution" text="Figyelem"/>
 <gentext key="caution" text="figyelem"/>
 <gentext key="Chapter" text="Fejezet"/>
 <gentext key="chapter" text="fejezet"/>
-<gentext key="Colophon" text="V&#x00E9;gsz&#x00F3;"/>
-<gentext key="colophon" text="v&#x00E9;gsz&#x00F3;"/>
+<gentext key="Colophon" text="Végszó"/>
+<gentext key="colophon" text="végszó"/>
 <gentext key="Copyright" text="Copyright"/>
 <gentext key="copyright" text="copyright"/>
-<gentext key="Dedication" text="Aj&#x00E1;nl&#x00E1;s"/>
-<gentext key="dedication" text="aj&#x00E1;nl&#x00E1;s"/>
-<gentext key="Edition" text="Kiad&#x00E1;s"/>
-<gentext key="edition" text="kiad&#x00E1;s"/>
+<gentext key="Dedication" text="Ajánlás"/>
+<gentext key="dedication" text="ajánlás"/>
+<gentext key="Edition" text="Kiadás"/>
+<gentext key="edition" text="kiadás"/>
 <gentext key="Equation" text="Egyenlet"/>
 <gentext key="equation" text="egyenlet"/>
-<gentext key="Example" text="P&#x00E9;lda"/>
-<gentext key="example" text="p&#x00E9;lda"/>
-<gentext key="Figure" text="&#x00C1;bra"/>
-<gentext key="figure" text="&#x00E1;bra"/>
-<gentext key="Glossary" text="Sz&#x00F3;jegyz&#x00E9;k"/>
-<gentext key="glossary" text="sz&#x00F3;jegyz&#x00E9;k"/>
-<gentext key="GlossSee" text="L&#x00E1;sd"/>
-<gentext key="glosssee" text="l&#x00E1;sd"/>
-<gentext key="GlossSeeAlso" text="L&#x00E1;sd m&#x00E9;g"/>
-<gentext key="glossseealso" text="l&#x00E1;sd m&#x00E9;g"/>
+<gentext key="Example" text="Példa"/>
+<gentext key="example" text="példa"/>
+<gentext key="Figure" text="Ábra"/>
+<gentext key="figure" text="ábra"/>
+<gentext key="Glossary" text="Szójegyzék"/>
+<gentext key="glossary" text="szójegyzék"/>
+<gentext key="GlossSee" text="Lásd"/>
+<gentext key="glosssee" text="lásd"/>
+<gentext key="GlossSeeAlso" text="Lásd még"/>
+<gentext key="glossseealso" text="lásd még"/>
 <gentext key="IMPORTANT" text="FONTOS"/>
 <gentext key="Important" text="Fontos"/>
 <gentext key="important" text="fontos"/>
-<gentext key="Index" text="T&#x00E1;rgymutat&#x00F3;"/>
-<gentext key="index" text="t&#x00E1;rgymutat&#x00F3;"/>
+<gentext key="Index" text="Tárgymutató"/>
+<gentext key="index" text="tárgymutató"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="isbn"/>
-<gentext key="LegalNotice" text="Jogi k&#x00F6;zlem&#x00E9;ny"/>
-<gentext key="legalnotice" text="jogi k&#x00F6;zlem&#x00E9;ny"/>
-<gentext key="MsgAud" text="C&#x00E9;lk&#x00F6;z&#x00F6;ns&#x00E9;g"/>
-<gentext key="msgaud" text="c&#x00E9;lk&#x00F6;z&#x00F6;ns&#x00E9;g"/>
+<gentext key="LegalNotice" text="Jogi közlemény"/>
+<gentext key="legalnotice" text="jogi közlemény"/>
+<gentext key="MsgAud" text="Célközönség"/>
+<gentext key="msgaud" text="célközönség"/>
 <gentext key="MsgLevel" text="Szint"/>
 <gentext key="msglevel" text="szint"/>
 <gentext key="MsgOrig" text="Eredet"/>
 <gentext key="msgorig" text="eredet"/>
-<gentext key="NOTE" text="MEGJEGYZ&#x00C9;S"/>
-<gentext key="Note" text="Megjegyz&#x00E9;s"/>
-<gentext key="note" text="megjegyz&#x00E9;s"/>
-<gentext key="Part" text="R&#x00E9;sz"/>
-<gentext key="part" text="r&#x00E9;sz"/>
-<gentext key="Preface" text="El&#x0151;sz&#x00F3;"/>
-<gentext key="preface" text="el&#x0151;sz&#x00F3;"/>
-<gentext key="Procedure" text="Elj&#x00E1;r&#x00E1;s"/>
-<gentext key="procedure" text="elj&#x00E1;r&#x00E1;s"/>
+<gentext key="NOTE" text="MEGJEGYZÉS"/>
+<gentext key="Note" text="Megjegyzés"/>
+<gentext key="note" text="megjegyzés"/>
+<gentext key="Part" text="Rész"/>
+<gentext key="part" text="rész"/>
+<gentext key="Preface" text="Előszó"/>
+<gentext key="preface" text="előszó"/>
+<gentext key="Procedure" text="Eljárás"/>
+<gentext key="procedure" text="eljárás"/>
 <gentext key="ProductionSet" text="Elemcsoport"/>
 <gentext key="Published" text="Megjelent"/>
 <gentext key="published" text="megjelent"/>
-<gentext key="Qandadiv" text="K &#x00E9;s V"/>
-<gentext key="qandadiv" text="K &#x00E9;s V"/>
+<gentext key="Qandadiv" text="K és V"/>
+<gentext key="qandadiv" text="K és V"/>
 <gentext key="Question" text="K:"/>
 <gentext key="question" text="k:"/>
-<gentext key="RefEntry" text="Bejegyz&#x00E9;s"/>
-<gentext key="refentry" text="bejegyz&#x00E9;s"/>
+<gentext key="RefEntry" text="Bejegyzés"/>
+<gentext key="refentry" text="bejegyzés"/>
 <gentext key="Reference" text="Referencia"/>
 <gentext key="reference" text="referencia"/>
-<gentext key="RefName" text="N&#x00E9;v"/>
-<gentext key="refname" text="n&#x00E9;v"/>
+<gentext key="RefName" text="Név"/>
+<gentext key="refname" text="név"/>
 <gentext key="RefSection" text="Szakasz"/>
 <gentext key="refsection" text="szakasz"/>
-<gentext key="RefSynopsisDiv" text="&#x00C1;ttekint&#x00E9;s"/>
-<gentext key="refsynopsisdiv" text="&#x00E1;ttekint&#x00E9;s"/>
-<gentext key="RevHistory" text="Verzi&#x00F3;t&#x00F6;rt&#x00E9;net"/>
-<gentext key="revhistory" text="verzi&#x00F3;t&#x00F6;rt&#x00E9;net"/>
-<gentext key="Revision" text="Verzi&#x00F3;"/>
-<gentext key="revision" text="verzi&#x00F3;"/>
+<gentext key="RefSynopsisDiv" text="Áttekintés"/>
+<gentext key="refsynopsisdiv" text="áttekintés"/>
+<gentext key="RevHistory" text="Verziótörténet"/>
+<gentext key="revhistory" text="verziótörténet"/>
+<gentext key="Revision" text="Verzió"/>
+<gentext key="revision" text="verzió"/>
 <gentext key="sect1" text="Szakasz"/>
 <gentext key="sect2" text="Szakasz"/>
 <gentext key="sect3" text="Szakasz"/>
@@ -108,21 +103,21 @@
 <gentext key="sect5" text="Szakasz"/>
 <gentext key="Section" text="Szakasz"/>
 <gentext key="section" text="szakasz"/>
-<gentext key="See" text="L&#x00E1;sd"/>
-<gentext key="see" text="l&#x00E1;sd"/>
-<gentext key="SeeAlso" text="L&#x00E1;sd m&#x00E9;g"/>
-<gentext key="Seealso" text="L&#x00E1;sd m&#x00E9;g"/>
-<gentext key="seealso" text="l&#x00E1;sd m&#x00E9;g"/>
+<gentext key="See" text="Lásd"/>
+<gentext key="see" text="lásd"/>
+<gentext key="SeeAlso" text="Lásd még"/>
+<gentext key="Seealso" text="Lásd még"/>
+<gentext key="seealso" text="lásd még"/>
 <gentext key="Set" text="Csoport"/>
 <gentext key="set" text="csoport"/>
-<gentext key="SetIndex" text="Csoportmutat&#x00F3;"/>
-<gentext key="setindex" text="csoportmutat&#x00F3;"/>
-<gentext key="Sidebar" text="Sz&#x00E9;ljegyzet"/>
-<gentext key="sidebar" text="sz&#x00E9;ljegyzet"/>
-<gentext key="Step" text="L&#x00E9;p&#x00E9;s"/>
-<gentext key="step" text="l&#x00E9;p&#x00E9;s"/>
-<gentext key="Table" text="T&#x00E1;bl&#x00E1;zat"/>
-<gentext key="table" text="t&#x00E1;bl&#x00E1;zat"/>
+<gentext key="SetIndex" text="Csoportmutató"/>
+<gentext key="setindex" text="csoportmutató"/>
+<gentext key="Sidebar" text="Széljegyzet"/>
+<gentext key="sidebar" text="széljegyzet"/>
+<gentext key="Step" text="Lépés"/>
+<gentext key="step" text="lépés"/>
+<gentext key="Table" text="Táblázat"/>
+<gentext key="table" text="táblázat"/>
 <gentext key="TIP" text="TIPP"/>
 <gentext key="Tip" text="Tipp"/>
 <gentext key="tip" text="tipp"/>
@@ -130,7 +125,7 @@
 <gentext key="Warning" text="Figyelem"/>
 <gentext key="warning" text="figyelem"/>
 
-<gentext key="and" text="&#x00E9;s"/>
+<gentext key="and" text="és"/>
 <gentext key="by" text=""/>
 <gentext key="Edited" text="Szerk."/>
 <gentext key="edited" text="szerk."/>
@@ -139,53 +134,53 @@
 <gentext key="in" text=""/>
 <gentext key="lastlistcomma" text=","/>
 <gentext key="listcomma" text=","/>
-<gentext key="nonexistantelement" text="nem l&#x00E9;tez&#x0151; elem"/>
-<gentext key="notes" text="megjegyz&#x00E9;sek"/>
-<gentext key="Notes" text="Megjegyz&#x00E9;sek"/>
+<gentext key="nonexistantelement" text="nem létező elem"/>
+<gentext key="notes" text="megjegyzések"/>
+<gentext key="Notes" text="Megjegyzések"/>
 <gentext key="Pgs" text="Lsz."/>
 <gentext key="pgs" text="lsz."/>
-<gentext key="Revisedby" text="Megvizsg&#x00E1;lva"/>
-<gentext key="revisedby" text="megvizsg&#x00E1;lva"/>
-<gentext key="TableNotes" text="Megjegyz&#x00E9;sek"/>
-<gentext key="tablenotes" text="megjegyz&#x00E9;sek"/>
+<gentext key="Revisedby" text="Megvizsgálva"/>
+<gentext key="revisedby" text="megvizsgálva"/>
+<gentext key="TableNotes" text="Megjegyzések"/>
+<gentext key="tablenotes" text="megjegyzések"/>
 <gentext key="TableofContents" text="Tartalom"/>
 <gentext key="tableofcontents" text="tartalom"/>
-<gentext key="unexpectedelementname" text="nem v&#x00E1;rt elemn&#x00E9;v"/>
-<gentext key="unsupported" text="nem t&#x00E1;mogatott"/>
+<gentext key="unexpectedelementname" text="nem várt elemnév"/>
+<gentext key="unsupported" text="nem támogatott"/>
 <gentext key="xrefto" text="keresztref"/>
 
-<gentext key="listofequations" text="az egyenletek list&#x00E1;ja"/>
-<gentext key="ListofEquations" text="Az egyenletek list&#x00E1;ja"/>
-<gentext key="ListofExamples" text="A p&#x00E9;ld&#x00E1;k list&#x00E1;ja"/>
-<gentext key="listofexamples" text="a p&#x00E9;ld&#x00E1;k list&#x00E1;ja"/>
-<gentext key="ListofFigures" text="Az &#x00E1;br&#x00E1;k list&#x00E1;ja"/>
-<gentext key="listoffigures" text="az &#x00E1;br&#x00E1;k list&#x00E1;ja"/>
-<gentext key="listoftables" text="a t&#x00E1;bl&#x00E1;zatok list&#x00E1;ja"/>
-<gentext key="ListofTables" text="A t&#x00E1;bl&#x00E1;zatok list&#x00E1;ja"/>
-<gentext key="ListofUnknown" text="Az egy&#x00E9;b elemek list&#x00E1;ja"/>
-<gentext key="listofunknown" text="az egy&#x00E9;b elemek list&#x00E1;ja"/>
+<gentext key="listofequations" text="az egyenletek listája"/>
+<gentext key="ListofEquations" text="Az egyenletek listája"/>
+<gentext key="ListofExamples" text="A példák listája"/>
+<gentext key="listofexamples" text="a példák listája"/>
+<gentext key="ListofFigures" text="Az ábrák listája"/>
+<gentext key="listoffigures" text="az ábrák listája"/>
+<gentext key="listoftables" text="a táblázatok listája"/>
+<gentext key="ListofTables" text="A táblázatok listája"/>
+<gentext key="ListofUnknown" text="Az egyéb elemek listája"/>
+<gentext key="listofunknown" text="az egyéb elemek listája"/>
 
 <gentext key="nav-home" text="Tartalom"/>
-<gentext key="nav-next" text="K&#x00F6;vetkez&#x0151;"/>
-<gentext key="nav-next-sibling" text="Gyors el&#x0151;re"/>
-<gentext key="nav-prev" text="El&#x0151;z&#x0151;"/>
+<gentext key="nav-next" text="Következő"/>
+<gentext key="nav-next-sibling" text="Gyors előre"/>
+<gentext key="nav-prev" text="Előző"/>
 <gentext key="nav-prev-sibling" text="Gyors vissza"/>
 <gentext key="nav-up" text="Fel"/>
 
-<gentext key="sectioncalled" text="ilyen nev&#x0171; szakasz:"/>
-<gentext key="Draft"         text="V&#x00E1;zlat"/>
-<gentext key="above"         text="fent"/>
-<gentext key="below"         text="lent"/>
-<gentext key="index symbols" text="szimb&#x00F3;lummutat&#x00F3;"/>
+<gentext key="sectioncalled" text="ilyen nevű szakasz:"/>
+<gentext key="Draft" text="Vázlat"/>
+<gentext key="above" text="fent"/>
+<gentext key="below" text="lent"/>
+<gentext key="index symbols" text="szimbólummutató"/>
 
-<gentext key="lowercase.alpha" text="a&#x00E1;bcde&#x00E9;fghi&#x00ED;jklmno&#x00F3;&#x00F6;&#x0151;pqrstu&#x00FA;&#x00FC;&#0171;vwxyz"/>
-<gentext key="uppercase.alpha" text="A&#x00C1;BCDE&#x00C9;FGHI&#x00CD;JKLMNO&#x00D3;&#x00D6;&#x0150;PQRSTU&#x00DA;&#x00DC;&#x0170;VWXYZ"/>
+<gentext key="lowercase.alpha" text="aábcdeéfghiíjklmnoóöőpqrstuúü«vwxyz"/>
+<gentext key="uppercase.alpha" text="AÁBCDEÉFGHIÍJKLMNOÓÖŐPQRSTUÚÜŰVWXYZ"/>
 
-<dingbat key="startquote" text="&#x201E;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x00BB;"/>
-<dingbat key="nestedendquote" text="&#x00AB;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="„"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="»"/>
+<dingbat key="nestedendquote" text="«"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
diff --git a/gentext/locale/ko.xml b/gentext/locale/ko.xml
index 9a47a390a..1b94fca58 100644
--- a/gentext/locale/ko.xml
+++ b/gentext/locale/ko.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
 <locale language="ko"
         english-language-name="Korean"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
   <author><firstname>Park</firstname><surname>Yong Joo</surname>
           <affiliation><address><email>yongjoo@kldp.org</email></address>
@@ -13,170 +13,170 @@
 </authorgroup>
 </doc:localeinfo>
 
-<gentext key="Abstract" text="&#xCD08;&#xB85D;"/>
-<gentext key="abstract" text="&#xCD08;&#xB85D;"/>
-<gentext key="Answer" text="&#xB2F5;&#xBCC0;"/>
-<gentext key="answer" text="&#xB2F5;&#xBCC0;"/>
-<gentext key="Appendix" text="&#xBD80;&#xB85D;"/>
-<gentext key="appendix" text="&#xBD80;&#xB85D;"/>
-<gentext key="Article" text="&#xBB38;&#xC11C;"/>
-<gentext key="article" text="&#xBB38;&#xC11C;"/>
-<gentext key="Bibliography" text="&#xC11C;&#xC9C0;&#xC0AC;&#xD56D;"/>
-<gentext key="bibliography" text="&#xC11C;&#xC9C0;&#xC0AC;&#xD56D;"/>
-<gentext key="Book" text="&#xCC45;"/>
-<gentext key="book" text="&#xCC45;"/>
-<gentext key="Caution" text="&#xACBD;&#xACE0;"/>
-<gentext key="caution" text="&#xACBD;&#xACE0;"/>
-<gentext key="CAUTION" text="[&#xACBD;&#xACE0;]"/>
-<gentext key="Chapter" text="&#xC7A5;"/>
-<gentext key="chapter" text="&#xC7A5;"/>
-<gentext key="Colophon" text="&#xD310;&#xAD8C;"/>
-<gentext key="colophon" text="&#xD310;&#xAD8C;"/>
-<gentext key="Copyright" text="&#xC800;&#xC791;&#xAD8C;"/>
-<gentext key="copyright" text="&#xC800;&#xC791;&#xAD8C;"/>
-<gentext key="Dedication" text="&#xBC14;&#xCE58;&#xB294; &#xAE00;"/>
-<gentext key="dedication" text="&#xBC14;&#xCE58;&#xB294; &#xAE00;"/>
-<gentext key="Edition" text="&#xC5EE;&#xC74C;"/>
-<gentext key="edition" text="&#xC5EE;&#xC74C;"/>
-<gentext key="Equation" text="&#xC218;&#xC2DD;"/>
-<gentext key="equation" text="&#xC218;&#xC2DD;"/>
-<gentext key="Example" text="&#xC608;"/>
-<gentext key="example" text="&#xC608;"/>
-<gentext key="Figure" text="&#xADF8;&#xB9BC;"/>
-<gentext key="figure" text="&#xADF8;&#xB9BC;"/>
-<gentext key="Glossary" text="&#xC6A9;&#xC5B4;&#xD574;&#xC124;"/>
-<gentext key="glossary" text="&#xC6A9;&#xC5B4;&#xD574;&#xC124;"/>
-<gentext key="GlossSee" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="glosssee" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="GlossSeeAlso" text="&#xB2E4;&#xB978; &#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="glossseealso" text="&#xB2E4;&#xB978; &#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="Important" text="&#xC911;&#xC694;"/>
-<gentext key="important" text="&#xC911;&#xC694;"/>
-<gentext key="IMPORTANT" text="[&#xC911;&#xC694;]"/>
-<gentext key="Index" text="&#xC0C9;&#xC778;"/>
-<gentext key="index" text="&#xC0C9;&#xC778;"/>
+<gentext key="Abstract" text="초록"/>
+<gentext key="abstract" text="초록"/>
+<gentext key="Answer" text="답변"/>
+<gentext key="answer" text="답변"/>
+<gentext key="Appendix" text="부록"/>
+<gentext key="appendix" text="부록"/>
+<gentext key="Article" text="문서"/>
+<gentext key="article" text="문서"/>
+<gentext key="Bibliography" text="서지사항"/>
+<gentext key="bibliography" text="서지사항"/>
+<gentext key="Book" text="책"/>
+<gentext key="book" text="책"/>
+<gentext key="Caution" text="경고"/>
+<gentext key="caution" text="경고"/>
+<gentext key="CAUTION" text="[경고]"/>
+<gentext key="Chapter" text="장"/>
+<gentext key="chapter" text="장"/>
+<gentext key="Colophon" text="판권"/>
+<gentext key="colophon" text="판권"/>
+<gentext key="Copyright" text="저작권"/>
+<gentext key="copyright" text="저작권"/>
+<gentext key="Dedication" text="바치는 글"/>
+<gentext key="dedication" text="바치는 글"/>
+<gentext key="Edition" text="엮음"/>
+<gentext key="edition" text="엮음"/>
+<gentext key="Equation" text="수식"/>
+<gentext key="equation" text="수식"/>
+<gentext key="Example" text="예"/>
+<gentext key="example" text="예"/>
+<gentext key="Figure" text="그림"/>
+<gentext key="figure" text="그림"/>
+<gentext key="Glossary" text="용어해설"/>
+<gentext key="glossary" text="용어해설"/>
+<gentext key="GlossSee" text="살펴볼 내용"/>
+<gentext key="glosssee" text="살펴볼 내용"/>
+<gentext key="GlossSeeAlso" text="다른 살펴볼 내용"/>
+<gentext key="glossseealso" text="다른 살펴볼 내용"/>
+<gentext key="Important" text="중요"/>
+<gentext key="important" text="중요"/>
+<gentext key="IMPORTANT" text="[중요]"/>
+<gentext key="Index" text="색인"/>
+<gentext key="index" text="색인"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="ISBN"/>
-<gentext key="LegalNotice" text="&#xBC95;&#xC801; &#xACF5;&#xC9C0;"/>
-<gentext key="legalnotice" text="&#xBC95;&#xC801; &#xACF5;&#xC9C0;"/>
-<gentext key="MsgAud" text="&#xBC1B;&#xB294; &#xC774;"/>
-<gentext key="msgaud" text="&#xBC1B;&#xB294; &#xC774;"/>
-<gentext key="MsgLevel" text="&#xC911;&#xC694;&#xB3C4;"/>
-<gentext key="msglevel" text="&#xC911;&#xC694;&#xB3C4;"/>
-<gentext key="MsgOrig" text="&#xBCF4;&#xB0B4;&#xB294; &#xC774;"/>
-<gentext key="msgorig" text="&#xBCF4;&#xB0B4;&#xB294; &#xC774;"/>
-<gentext key="Note" text="&#xCC38;&#xACE0;"/>
-<gentext key="note" text="&#xCC38;&#xACE0;"/>
-<gentext key="NOTE" text="[&#xCC38;&#xACE0;]"/>
-<gentext key="Part" text="&#xBD80;"/>
-<gentext key="part" text="&#xBD80;"/>
-<gentext key="Preface" text="&#xC11C;&#xBB38;"/>
-<gentext key="preface" text="&#xC11C;&#xBB38;"/>
-<gentext key="Procedure" text="&#xC808;&#xCC28;"/>
-<gentext key="procedure" text="&#xC808;&#xCC28;"/>
+<gentext key="LegalNotice" text="법적 공지"/>
+<gentext key="legalnotice" text="법적 공지"/>
+<gentext key="MsgAud" text="받는 이"/>
+<gentext key="msgaud" text="받는 이"/>
+<gentext key="MsgLevel" text="중요도"/>
+<gentext key="msglevel" text="중요도"/>
+<gentext key="MsgOrig" text="보내는 이"/>
+<gentext key="msgorig" text="보내는 이"/>
+<gentext key="Note" text="참고"/>
+<gentext key="note" text="참고"/>
+<gentext key="NOTE" text="[참고]"/>
+<gentext key="Part" text="부"/>
+<gentext key="part" text="부"/>
+<gentext key="Preface" text="서문"/>
+<gentext key="preface" text="서문"/>
+<gentext key="Procedure" text="절차"/>
+<gentext key="procedure" text="절차"/>
 <gentext key="ProductionSet" text="Production"/> <!-- en -->
-<gentext key="Published" text="&#xD3B4;&#xB0C4;"/>
-<gentext key="published" text="&#xD3B4;&#xB0C4;"/>
-<gentext key="Qandadiv" text="&#xC9C8;&#xBB38;&#xADF8;&#xB9AC;&#xACE0;&#xB2F5;&#xBCC0;"/>
-<gentext key="qandadiv" text="&#xC9C8;&#xBB38;&#xADF8;&#xB9AC;&#xACE0;&#xB2F5;&#xBCC0;"/>
-<gentext key="Question" text="&#xC9C8;&#xBB38;"/>
-<gentext key="question" text="&#xC9C8;&#xBB38;"/>
+<gentext key="Published" text="펴냄"/>
+<gentext key="published" text="펴냄"/>
+<gentext key="Qandadiv" text="질문그리고답변"/>
+<gentext key="qandadiv" text="질문그리고답변"/>
+<gentext key="Question" text="질문"/>
+<gentext key="question" text="질문"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="Reference" text="&#xCC38;&#xACE0;&#xBB38;&#xD5CC;"/>
-<gentext key="reference" text="&#xCC38;&#xACE0;&#xBB38;&#xD5CC;"/>
-<gentext key="RefName" text="&#xC81C;&#xBAA9;"/>
-<gentext key="refname" text="&#xC81C;&#xBAA9;"/>
+<gentext key="Reference" text="참고문헌"/>
+<gentext key="reference" text="참고문헌"/>
+<gentext key="RefName" text="제목"/>
+<gentext key="refname" text="제목"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
-<gentext key="RefSynopsisDiv" text="&#xC694;&#xC57D;"/>
-<gentext key="refsynopsisdiv" text="&#xC694;&#xC57D;"/>
-<gentext key="RevHistory" text="&#xACE0;&#xCE5C; &#xACFC;&#xC815;"/>
-<gentext key="revhistory" text="&#xACE0;&#xCE5C; &#xACFC;&#xC815;"/>
-<gentext key="Revision" text="&#xACE0;&#xCE68;"/>
-<gentext key="revision" text="&#xACE0;&#xCE68;"/>
+<gentext key="RefSynopsisDiv" text="요약"/>
+<gentext key="refsynopsisdiv" text="요약"/>
+<gentext key="RevHistory" text="고친 과정"/>
+<gentext key="revhistory" text="고친 과정"/>
+<gentext key="Revision" text="고침"/>
+<gentext key="revision" text="고침"/>
 <gentext key="sect1" text="Section"/> <!-- en -->
 <gentext key="sect2" text="Section"/> <!-- en -->
 <gentext key="sect3" text="Section"/> <!-- en -->
 <gentext key="sect4" text="Section"/> <!-- en -->
 <gentext key="sect5" text="Section"/> <!-- en -->
-<gentext key="Section" text="&#xC808;"/>
-<gentext key="section" text="&#xC808;"/>
-<gentext key="See" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="see" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="Seealso" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB2E4;&#xB978; &#xB0B4;&#xC6A9;"/>
-<gentext key="SeeAlso" text="[&#xC0B4;&#xD3B4;&#xBCFC; &#xB2E4;&#xB978; &#xB0B4;&#xC6A9;]"/>
-<gentext key="seealso" text="[&#xC0B4;&#xD3B4;&#xBCFC; &#xB2E4;&#xB978; &#xB0B4;&#xC6A9;]"/>
-<gentext key="Set" text="&#xC804;&#xC9D1;"/>
-<gentext key="set" text="&#xC804;&#xC9D1;"/>
-<gentext key="SetIndex" text="&#xC804;&#xC9D1; &#xC0C9;&#xC778;"/>
-<gentext key="setindex" text="&#xC804;&#xC9D1; &#xC0C9;&#xC778;"/>
+<gentext key="Section" text="절"/>
+<gentext key="section" text="절"/>
+<gentext key="See" text="살펴볼 내용"/>
+<gentext key="see" text="살펴볼 내용"/>
+<gentext key="Seealso" text="살펴볼 다른 내용"/>
+<gentext key="SeeAlso" text="[살펴볼 다른 내용]"/>
+<gentext key="seealso" text="[살펴볼 다른 내용]"/>
+<gentext key="Set" text="전집"/>
+<gentext key="set" text="전집"/>
+<gentext key="SetIndex" text="전집 색인"/>
+<gentext key="setindex" text="전집 색인"/>
 <gentext key="Sidebar" text=""/>
-<gentext key="sidebar" text="&#xB367;&#xBD99;&#xC784;"/>
-<gentext key="Step" text="&#xB2E8;&#xACC4;"/>
-<gentext key="step" text="&#xB2E8;&#xACC4;"/>
-<gentext key="Table" text="&#xD45C;"/>
-<gentext key="table" text="&#xD45C;"/>
-<gentext key="Tip" text="&#xC791;&#xC740; &#xC815;&#xBCF4;"/>
-<gentext key="tip" text="&#xC791;&#xC740; &#xC815;&#xBCF4;"/>
-<gentext key="TIP" text="[&#xC791;&#xC740; &#xC815;&#xBCF4;]"/>
-<gentext key="WARNING" text="&#xC8FC;&#xC758;!"/>
-<gentext key="Warning" text="&#xC8FC;&#xC758;"/>
-<gentext key="warning" text="&#xC8FC;&#xC758;"/>
-
-<gentext key="and" text="&#xADF8;&#xB9AC;&#xACE0;"/>
-<gentext key="by" text="&#xC9C0;&#xC740;&#xC774;"/>
-<gentext key="Edited" text="&#xC5EE;&#xC74C;"/>
-<gentext key="edited" text="&#xC5EE;&#xC74C;"/>
-<gentext key="Editedby" text="&#xC5EE;&#xC740;&#xC774;"/>
-<gentext key="editedby" text="&#xC5EE;&#xC740;&#xC774;"/>
+<gentext key="sidebar" text="덧붙임"/>
+<gentext key="Step" text="단계"/>
+<gentext key="step" text="단계"/>
+<gentext key="Table" text="표"/>
+<gentext key="table" text="표"/>
+<gentext key="Tip" text="작은 정보"/>
+<gentext key="tip" text="작은 정보"/>
+<gentext key="TIP" text="[작은 정보]"/>
+<gentext key="WARNING" text="주의!"/>
+<gentext key="Warning" text="주의"/>
+<gentext key="warning" text="주의"/>
+
+<gentext key="and" text="그리고"/>
+<gentext key="by" text="지은이"/>
+<gentext key="Edited" text="엮음"/>
+<gentext key="edited" text="엮음"/>
+<gentext key="Editedby" text="엮은이"/>
+<gentext key="editedby" text="엮은이"/>
 <gentext key="in" text="-"/>
 <gentext key="lastlistcomma" text=","/>
 <gentext key="listcomma" text=","/>
-<gentext key="nonexistantelement" text="&#xC874;&#xC7AC;&#xD558;&#xC9C0; &#xC54A;&#xB294; &#xAE30;&#xCD08;&#xC694;&#xC18C;&#xC785;&#xB2C8;&#xB2E4;"/>
-<gentext key="notes" text="&#xC8FC;&#xC11D;"/>
-<gentext key="Notes" text="&#xC8FC;&#xC11D;"/>
+<gentext key="nonexistantelement" text="존재하지 않는 기초요소입니다"/>
+<gentext key="notes" text="주석"/>
+<gentext key="Notes" text="주석"/>
 <gentext key="Pgs" text="Pgs."/>
 <gentext key="pgs" text="Pgs."/>
-<gentext key="Revisedby" text="&#xACE0;&#xCE5C;&#xC774; "/>
-<gentext key="revisedby" text="&#xACE0;&#xCE5C;&#xC774; "/>
-<gentext key="TableNotes" text="&#xCC38;&#xACE0;"/>
-<gentext key="tablenotes" text="&#xCC38;&#xACE0;"/>
-<gentext key="TableofContents" text="&#xCC28;&#xB840;"/>
-<gentext key="tableofcontents" text="&#xCC28;&#xB840;"/>
-<gentext key="unexpectedelementname" text="&#xC54C; &#xC218; &#xC5C6;&#xB294; &#xAE30;&#xCD08;&#xC694;&#xC18C; &#xC774;&#xB984;&#xC785;&#xB2C8;&#xB2E4;"/>
-<gentext key="unsupported" text="&#xC9C0;&#xC6D0;&#xB418;&#xC9C0; &#xC54A;&#xC2B5;&#xB2C8;&#xB2E4;"/>
-<gentext key="xrefto" text="&#xC774; &#xACF3;&#xC744; &#xCC38;&#xC870;&#xD558;&#xC138;&#xC694; : "/>
-
-<gentext key="listofequations" text="&#xC218;&#xC2DD; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofEquations" text="&#xC218;&#xC2DD; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofExamples" text="&#xC608; &#xBAA9;&#xB85D;"/>
-<gentext key="listofexamples" text="&#xC608; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofFigures" text="&#xADF8;&#xB9BC; &#xBAA9;&#xB85D;"/>
-<gentext key="listoffigures" text="&#xADF8;&#xB9BC; &#xBAA9;&#xB85D;"/>
-<gentext key="listoftables" text="&#xD45C; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofTables" text="&#xD45C; &#xBAA9;&#xB85D;"/>
-<gentext key="ListofUnknown" text="&#xAE30;&#xD0C0; &#xBAA9;&#xB85D;"/>
-<gentext key="listofunknown" text="&#xAE30;&#xD0C0; &#xBAA9;&#xB85D;"/>
-
-<gentext key="nav-home" text="&#xCC98;&#xC74C;&#xC73C;&#xB85C;"/>
-<gentext key="nav-next" text="&#xB2E4;&#xC74C;"/>
-<gentext key="nav-next-sibling" text="&#xB2E4;&#xC74C;&#xC73C;&#xB85C; &#xAC74;&#xB108;&#xB700;"/>
-<gentext key="nav-prev" text="&#xC774;&#xC804;"/>
-<gentext key="nav-prev-sibling" text="&#xC774;&#xC804;&#xC73C;&#xB85C; &#xAC74;&#xB108;&#xB700;"/>
-<gentext key="nav-up" text="&#xC704;&#xB85C;"/>
+<gentext key="Revisedby" text="고친이 "/>
+<gentext key="revisedby" text="고친이 "/>
+<gentext key="TableNotes" text="참고"/>
+<gentext key="tablenotes" text="참고"/>
+<gentext key="TableofContents" text="차례"/>
+<gentext key="tableofcontents" text="차례"/>
+<gentext key="unexpectedelementname" text="알 수 없는 기초요소 이름입니다"/>
+<gentext key="unsupported" text="지원되지 않습니다"/>
+<gentext key="xrefto" text="이 곳을 참조하세요 : "/>
+
+<gentext key="listofequations" text="수식 목록"/>
+<gentext key="ListofEquations" text="수식 목록"/>
+<gentext key="ListofExamples" text="예 목록"/>
+<gentext key="listofexamples" text="예 목록"/>
+<gentext key="ListofFigures" text="그림 목록"/>
+<gentext key="listoffigures" text="그림 목록"/>
+<gentext key="listoftables" text="표 목록"/>
+<gentext key="ListofTables" text="표 목록"/>
+<gentext key="ListofUnknown" text="기타 목록"/>
+<gentext key="listofunknown" text="기타 목록"/>
+
+<gentext key="nav-home" text="처음으로"/>
+<gentext key="nav-next" text="다음"/>
+<gentext key="nav-next-sibling" text="다음으로 건너뜀"/>
+<gentext key="nav-prev" text="이전"/>
+<gentext key="nav-prev-sibling" text="이전으로 건너뜀"/>
+<gentext key="nav-up" text="위로"/>
 
 <gentext key="sectioncalled" text="the section called"/> <!-- en -->
-<gentext key="Draft"         text="Draft"/> <!-- en -->
-<gentext key="above"         text="above"/> <!-- en -->
-<gentext key="below"         text="below"/> <!-- en -->
+<gentext key="Draft" text="Draft"/> <!-- en -->
+<gentext key="above" text="above"/> <!-- en -->
+<gentext key="below" text="below"/> <!-- en -->
 <gentext key="index symbols" text="Symbols"/> <!-- en -->
 
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
@@ -459,7 +459,7 @@
 <template name="productionset"><ProductionSet/>&#160;%n. <startquote/>%t<endquote/></template>
 <template name="qandadiv"><Qandadiv/>&#160;%n. <startquote/>%t<endquote/></template>
 <template name="refsect1"><startquote/>%t<endquote/></template>
-<template name="refsect2">startquote/>%t<endquote/></template>
+<template name="refsect2"><startquote/>%t<endquote/></template>
 <template name="refsect3"><startquote/>%t<endquote/></template>
 <template name="refsection"><startquote/>%t<endquote/></template>
 <template name="sect1">%n<Section/>. <startquote/>%t<endquote/></template>
diff --git a/gentext/locale/nn.xml b/gentext/locale/nn.xml
index 76775a877..e53d787c9 100644
--- a/gentext/locale/nn.xml
+++ b/gentext/locale/nn.xml
@@ -1,14 +1,10 @@
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-]>
 <locale language="nn"
         english-language-name="Nynorsk"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
   <author><firstname>Frederik</firstname><surname>Fouvry</surname>
           <affiliation><address><email>fouvry@CoLi.Uni-SB.DE</email></address>
@@ -41,20 +37,20 @@
 <gentext key="copyright" text="opphavsrett"/>
 <gentext key="Dedication" text="Dedikasjon"/>
 <gentext key="dedication" text="dedikasjon"/>
-<gentext key="Edition" text="Utg&#229;ve"/>
-<gentext key="edition" text="utg&#229;ve"/>
+<gentext key="Edition" text="Utgåve"/>
+<gentext key="edition" text="utgåve"/>
 <gentext key="Equation" text="Formel"/>
 <gentext key="equation" text="formel"/>
-<gentext key="Example" text="D&#248;me"/>
-<gentext key="example" text="d&#248;me"/>
+<gentext key="Example" text="Døme"/>
+<gentext key="example" text="døme"/>
 <gentext key="Figure" text="Figur"/>
 <gentext key="figure" text="figur"/>
 <gentext key="Glossary" text="Ordliste"/>
 <gentext key="glossary" text="ordliste"/>
-<gentext key="GlossSee" text="Sj&#229;"/>
-<gentext key="glosssee" text="sj&#229;"/>
-<gentext key="GlossSeeAlso" text="Sj&#229; &#242;g"/>
-<gentext key="glossseealso" text="sj&#229; &#242;g"/>
+<gentext key="GlossSee" text="Sjå"/>
+<gentext key="glosssee" text="sjå"/>
+<gentext key="GlossSeeAlso" text="Sjå òg"/>
+<gentext key="glossseealso" text="sjå òg"/>
 <gentext key="IMPORTANT" text="VIKTIG"/>
 <gentext key="Important" text="Viktig"/>
 <gentext key="important" text="viktig"/>
@@ -67,8 +63,8 @@
 <gentext key="legalnotice" text=""/>
 <gentext key="MsgAud" text="Publikum"/>
 <gentext key="msgaud" text="publikum"/>
-<gentext key="MsgLevel" text="Niv&#229;"/>
-<gentext key="msglevel" text="niv&#229;"/>
+<gentext key="MsgLevel" text="Nivå"/>
+<gentext key="msglevel" text="nivå"/>
 <gentext key="MsgOrig" text="Opphav"/>
 <gentext key="msgorig" text="Opphav"/>
 <gentext key="NOTE" text="NOTAT"/>
@@ -84,10 +80,10 @@
 <gentext key="ProductionSet" text="Production"/> <!-- en -->
 <gentext key="Published" text="Utgitt"/>
 <gentext key="published" text="utgitt"/>
-<gentext key="Qandadiv" text="Sp&#248;rsm&#229;l og Svar"/>
-<gentext key="qandadiv" text="Sp&#248;rsm&#229;l og Svar"/>
-<gentext key="Question" text="Sp&#248;rsm&#229;l"/>
-<gentext key="question" text="sp&#248;rsm&#229;l"/>
+<gentext key="Qandadiv" text="Spørsmål og Svar"/>
+<gentext key="qandadiv" text="Spørsmål og Svar"/>
+<gentext key="Question" text="Spørsmål"/>
+<gentext key="question" text="spørsmål"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
 <gentext key="Reference" text="Referanse"/>
@@ -109,10 +105,10 @@
 <gentext key="sect5" text="Section"/> <!-- en -->
 <gentext key="Section" text="Del"/>
 <gentext key="section" text="del"/>
-<gentext key="See" text="Sj&#229;"/>
-<gentext key="see" text="sj&#229;"/>
-<gentext key="SeeAlso" text="Sj&#229; &#242;g"/>
-<gentext key="seealso" text="sj&#229; &#242;g"/>
+<gentext key="See" text="Sjå"/>
+<gentext key="see" text="sjå"/>
+<gentext key="SeeAlso" text="Sjå òg"/>
+<gentext key="seealso" text="sjå òg"/>
 <gentext key="Set" text="Set"/>
 <gentext key="set" text="set"/>
 <gentext key="SetIndex" text="Indeks"/>
@@ -127,13 +123,13 @@
 <gentext key="Tip" text="Tips"/>
 <gentext key="tip" text="tips"/>
 <gentext key="tip" text="tips"/>
-<gentext key="WARNING" text="&#197;TVARING"/>
-<gentext key="Warning" text="&#197;tvaring"/>
-<gentext key="warning" text="&#229;tvaring"/>
-<gentext key="warning" text="&#229;tvaring"/>
+<gentext key="WARNING" text="ÅTVARING"/>
+<gentext key="Warning" text="Åtvaring"/>
+<gentext key="warning" text="Ã¥tvaring"/>
+<gentext key="warning" text="Ã¥tvaring"/>
 
-<gentext key="Seealso" text="Sj&#229; &#242;g"/>
-<gentext key="seealso" text="sj&#229; &#242;g"/>
+<gentext key="Seealso" text="Sjå òg"/>
+<gentext key="seealso" text="sjå òg"/>
 <gentext key="TableofContents" text="Innhald"/>
 <gentext key="tableofcontents" text="Innhald"/>
 <gentext key="in" text="i"/>
@@ -152,15 +148,15 @@
 <gentext key="nonexistantelement" text="ikkje-eksisterande element"/>
 <gentext key="Pgs" text="Sider"/>
 <gentext key="pgs" text="sider"/>
-<gentext key="unsupported" text="ikkje st&#248;tta"/>
+<gentext key="unsupported" text="ikkje støtta"/>
 <gentext key="xrefto" text="xref til"/>
 <gentext key="unexpectedelementname" text="UVENTA-ELEMENTNAVN"/>
 <gentext key="Revisedby" text="Revidert av: "/>
 <gentext key="revisedby" text="revidert av: "/>
 <gentext key="ListofTables" text="Tabelloversikt"/>
 <gentext key="listoftables" text="tabelloversikt"/>
-<gentext key="ListofExamples" text="D&#248;meoversikt"/>
-<gentext key="listofexamples" text="d&#248;meoversikt"/>
+<gentext key="ListofExamples" text="Dømeoversikt"/>
+<gentext key="listofexamples" text="dømeoversikt"/>
 <gentext key="ListofFigures" text="Figuroversikt"/>
 <gentext key="listoffigures" text="figuroversikt"/>
 <gentext key="ListofEquations" text="Formeloversikt"/>
@@ -176,19 +172,19 @@
 <gentext key="nav-home" text="Heim"/>
 
 <gentext key="sectioncalled" text="the section called"/> <!-- en -->
-<gentext key="Draft"         text="Draft"/> <!-- en -->
-<gentext key="above"         text="above"/> <!-- en -->
-<gentext key="below"         text="below"/> <!-- en -->
+<gentext key="Draft" text="Draft"/> <!-- en -->
+<gentext key="above" text="above"/> <!-- en -->
+<gentext key="below" text="below"/> <!-- en -->
 <gentext key="index symbols" text="Symbols"/> <!-- en -->
 
 <gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/> <!--en-->
 <gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/> <!--en-->
 
-<dingbat key="startquote" text="&#8220;"/>
-<dingbat key="endquote" text="&#8221;"/>
-<dingbat key="nestedstartquote" text="&#8216;"/>
-<dingbat key="nestedendquote" text="&#8217;"/>
-<dingbat key="bullet" text="&#8226;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
diff --git a/gentext/locale/no.xml b/gentext/locale/no.xml
index ff601f71c..ff63c57e2 100644
--- a/gentext/locale/no.xml
+++ b/gentext/locale/no.xml
@@ -1,15 +1,10 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-]>
 <locale language="no"
         english-language-name="Norwegian"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <!-- FIXME: list the real contributors
 <authorgroup>
   <author><firstname>Norman</firstname><surname>Walsh</surname>
@@ -55,8 +50,8 @@
 <gentext key="glossary" text="Ordliste"/>
 <gentext key="GlossSee" text="Se"/>
 <gentext key="glosssee" text="Se"/>
-<gentext key="GlossSeeAlso" text="Se Ogs&aring;"/>
-<gentext key="glossseealso" text="Se Ogs&aring;"/>
+<gentext key="GlossSeeAlso" text="Se Også"/>
+<gentext key="glossseealso" text="Se Også"/>
 <gentext key="IMPORTANT" text="VIKTIG"/>
 <gentext key="Important" text="Viktig"/>
 <gentext key="important" text="Viktig"/>
@@ -68,8 +63,8 @@
 <gentext key="legalnotice" text=""/>
 <gentext key="MsgAud" text="Publikum"/>
 <gentext key="msgaud" text="Publikum"/>
-<gentext key="MsgLevel" text="Niv&aring;"/>
-<gentext key="msglevel" text="Niv&aring;"/>
+<gentext key="MsgLevel" text="Nivå"/>
+<gentext key="msglevel" text="Nivå"/>
 <gentext key="MsgOrig" text="Opphav"/>
 <gentext key="msgorig" text="Opphav"/>
 <gentext key="NOTE" text="NOTAT"/>
@@ -111,9 +106,9 @@
 <gentext key="section" text="seksjon"/>
 <gentext key="See" text="Se"/>
 <gentext key="see" text="Se"/>
-<gentext key="SeeAlso" text="Se Ogs&aring;"/>
-<gentext key="Seealso" text="Se ogs&aring;"/>
-<gentext key="seealso" text="Se Ogs&aring;"/>
+<gentext key="SeeAlso" text="Se Også"/>
+<gentext key="Seealso" text="Se også"/>
+<gentext key="seealso" text="Se Også"/>
 <gentext key="Set" text=""/>
 <gentext key="set" text=""/>
 <gentext key="SetIndex" text="Indeks"/>
@@ -152,7 +147,7 @@
 <gentext key="TableofContents" text="Innholdsfortegnelse"/>
 <gentext key="tableofcontents" text="Innholdsfortegnelse"/>
 <gentext key="unexpectedelementname" text="UVENTET-ELEMENTNAVN"/>
-<gentext key="unsupported" text="ikke st&oslash;ttet"/>
+<gentext key="unsupported" text="ikke støttet"/>
 <gentext key="xrefto" text="xref til"/>
 
 <gentext key="listofequations" text="Formeloversikt"/>
@@ -174,19 +169,19 @@
 <gentext key="nav-up" text="Opp"/>
 
 <gentext key="sectioncalled" text="the section called"/> <!-- en -->
-<gentext key="Draft"         text="Draft"/> <!-- en -->
-<gentext key="above"         text="above"/> <!-- en -->
-<gentext key="below"         text="below"/> <!-- en -->
+<gentext key="Draft" text="Draft"/> <!-- en -->
+<gentext key="above" text="above"/> <!-- en -->
+<gentext key="below" text="below"/> <!-- en -->
 <gentext key="index symbols" text="Symbols"/> <!-- en -->
 
 <gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/> <!--en-->
 <gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/> <!--en-->
 
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
diff --git a/gentext/locale/ro.xml b/gentext/locale/ro.xml
index c4ab8eac2..15b31eec2 100644
--- a/gentext/locale/ro.xml
+++ b/gentext/locale/ro.xml
@@ -1,18 +1,10 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat1.ent">
-%lat1;
-<!ENTITY % lat2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isolat2.ent">
-%lat2;
-]>
 <locale language="ro"
         english-language-name="Romanian"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <!-- FIXME: list the real contributors
 <authorgroup>
   <author><firstname>Norman</firstname><surname>Walsh</surname>
@@ -39,21 +31,21 @@
 <gentext key="bibliography" text="Bibliografie"/>
 <gentext key="Book" text="Carte"/>
 <gentext key="book" text="Carte"/>
-<gentext key="CAUTION" text="ATEN&#538;IE"/>
-<gentext key="Caution" text="Aten&#539;ie"/>
-<gentext key="caution" text="Aten&#539;ie"/>
+<gentext key="CAUTION" text="ATENȚIE"/>
+<gentext key="Caution" text="Atenție"/>
+<gentext key="caution" text="Atenție"/>
 <gentext key="Chapter" text="Cap."/>
 <gentext key="chapter" text="cap."/>
 <gentext key="Colophon" text="Colophon"/> <!-- en -->
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
 <gentext key="copyright" text="Copyright"/>
-<gentext key="Dedication" text="Dedica&#539;ie"/>
-<gentext key="dedication" text="Dedica&#539;ie"/>
-<gentext key="Edition" text="Edi&#539;ie"/>
-<gentext key="edition" text="Edi&#539;ie"/>
-<gentext key="Equation" text="ecua&#539;ia"/>
-<gentext key="equation" text="ecua&#539;ia"/>
+<gentext key="Dedication" text="Dedicație"/>
+<gentext key="dedication" text="Dedicație"/>
+<gentext key="Edition" text="Ediție"/>
+<gentext key="edition" text="Ediție"/>
+<gentext key="Equation" text="ecuația"/>
+<gentext key="equation" text="ecuația"/>
 <gentext key="Example" text="Exemplu"/>
 <gentext key="example" text="Exemplu"/>
 <gentext key="Figure" text="Fig."/>
@@ -62,8 +54,8 @@
 <gentext key="glossary" text="Glosar"/>
 <gentext key="GlossSee" text="Vezi"/>
 <gentext key="glosssee" text="Vezi"/>
-<gentext key="GlossSeeAlso" text="Vezi &#537;i"/>
-<gentext key="glossseealso" text="Vezi &#537;i"/>
+<gentext key="GlossSeeAlso" text="Vezi și"/>
+<gentext key="glossseealso" text="Vezi și"/>
 <gentext key="IMPORTANT" text="IMPORTANT"/>
 <gentext key="Important" text="Important"/>
 <gentext key="important" text="Important"/>
@@ -79,26 +71,26 @@
 <gentext key="msglevel" text="Nivel"/>
 <gentext key="MsgOrig" text="Origine"/>
 <gentext key="msgorig" text="Origine"/>
-<gentext key="NOTE" text="NOT&#258;"/>
-<gentext key="Note" text="Not&#259;"/>
-<gentext key="note" text="Not&#259;"/>
+<gentext key="NOTE" text="NOTĂ"/>
+<gentext key="Note" text="Notă"/>
+<gentext key="note" text="Notă"/>
 <gentext key="Part" text="Parte"/>
 <gentext key="part" text="Parte"/>
-<gentext key="Preface" text="Prefa&#539;&#259;"/>
-<gentext key="preface" text="Prefa&#539;&#259;"/>
-<gentext key="Procedure" text="Procedur&#259;"/>
-<gentext key="procedure" text="Procedur&#259;"/>
+<gentext key="Preface" text="Prefață"/>
+<gentext key="preface" text="Prefață"/>
+<gentext key="Procedure" text="Procedură"/>
+<gentext key="procedure" text="Procedură"/>
 <gentext key="ProductionSet" text="Production"/> <!-- en -->
 <gentext key="Published" text="Publicat"/>
 <gentext key="published" text="Publicat"/>
-<gentext key="Qandadiv" text="&#206;ntreb&#259;ri &#537;i r&#259;spunsuri"/> <!-- en -->
-<gentext key="qandadiv" text="&#238;ntreb&#259;ri &#537;i r&#259;spunsuri"/> <!-- en -->
-<gentext key="Question" text="&#206;:"/>
-<gentext key="question" text="&#238;:"/>
+<gentext key="Qandadiv" text="Întrebări și răspunsuri"/> <!-- en -->
+<gentext key="qandadiv" text="întrebări și răspunsuri"/> <!-- en -->
+<gentext key="Question" text="Î:"/>
+<gentext key="question" text="î:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="Reference" text="Referin&#539;&#259;"/>
-<gentext key="reference" text="Referin&#539;&#259;"/>
+<gentext key="Reference" text="Referință"/>
+<gentext key="reference" text="Referință"/>
 <gentext key="RefName" text="Nume"/>
 <gentext key="refname" text="Nume"/>
 <gentext key="RefSection" text=""/>
@@ -109,42 +101,42 @@
 <gentext key="revhistory" text="Istoricul versiunilor"/>
 <gentext key="Revision" text="Versiune"/>
 <gentext key="revision" text="Versiune"/>
-<gentext key="sect1" text="Sec&#539;iune"/> <!-- en -->
-<gentext key="sect2" text="Sec&#539;iune"/> <!-- en -->
-<gentext key="sect3" text="Sec&#539;iune"/> <!-- en -->
-<gentext key="sect4" text="Sec&#539;iune"/> <!-- en -->
-<gentext key="sect5" text="Sec&#539;iune"/> <!-- en -->
-<gentext key="Section" text="Sec&#539;iune"/>
+<gentext key="sect1" text="Secțiune"/> <!-- en -->
+<gentext key="sect2" text="Secțiune"/> <!-- en -->
+<gentext key="sect3" text="Secțiune"/> <!-- en -->
+<gentext key="sect4" text="Secțiune"/> <!-- en -->
+<gentext key="sect5" text="Secțiune"/> <!-- en -->
+<gentext key="Section" text="Secțiune"/>
 <gentext key="section" text="sec."/>
 <gentext key="See" text="Vezi"/>
 <gentext key="see" text="Vezi"/>
-<gentext key="SeeAlso" text="Vezi &#537;i"/>
-<gentext key="Seealso" text="Vezi &#537;i"/>
-<gentext key="seealso" text="Vezi &#537;i"/>
+<gentext key="SeeAlso" text="Vezi și"/>
+<gentext key="Seealso" text="Vezi și"/>
+<gentext key="seealso" text="Vezi și"/>
 <gentext key="Set" text="Set"/>
 <gentext key="set" text="Set"/>
 <gentext key="SetIndex" text="Index"/>
 <gentext key="setindex" text="Index"/>
 <gentext key="Sidebar" text=""/>
 <gentext key="sidebar" text="sidebar"/>
-<gentext key="Step" text="Opera&#539;ie"/>
-<gentext key="step" text="opera&#539;iune"/>
+<gentext key="Step" text="Operație"/>
+<gentext key="step" text="operațiune"/>
 <gentext key="Table" text="Tabel"/>
 <gentext key="table" text="Tabel"/>
-<gentext key="TIP" text="INDICA&#538;IE"/>
-<gentext key="Tip" text="Indica&#539;ie"/>
-<gentext key="tip" text="Indica&#539;ie"/>
+<gentext key="TIP" text="INDICAȚIE"/>
+<gentext key="Tip" text="Indicație"/>
+<gentext key="tip" text="Indicație"/>
 <gentext key="WARNING" text="AVERTISMENT"/>
 <gentext key="Warning" text="Avertisment"/>
 <gentext key="warning" text="Avertisment"/>
 
-<gentext key="and" text="&#537;i"/>
+<gentext key="and" text="și"/>
 <gentext key="by" text="de"/>
 <gentext key="Edited" text="Publicat"/>
 <gentext key="edited" text="Publicat"/>
 <gentext key="Editedby" text="Publicat de"/>
 <gentext key="editedby" text="Publicat de"/>
-<gentext key="in" text="&icirc;n"/>
+<gentext key="in" text="în"/>
 <gentext key="lastlistcomma" text=","/>
 <gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="element inexistent"/>
@@ -158,42 +150,42 @@
 <gentext key="tablenotes" text="Remarci"/>
 <gentext key="TableofContents" text="Cuprins"/>
 <gentext key="tableofcontents" text="Cuprins"/>
-<gentext key="unexpectedelementname" text="Nume de element nea&#537;teptat"/>
+<gentext key="unexpectedelementname" text="Nume de element neașteptat"/>
 <gentext key="unsupported" text="nerecunoscut de sisitem"/>
-<gentext key="xrefto" text="referin&#539;&#259; c&#259;tre"/>
-
-<gentext key="listofequations" text="List&#259; de ecua&#539;ii"/>
-<gentext key="ListofEquations" text="List&#259; de ecua&#539;ii"/>
-<gentext key="ListofExamples" text="List&#259; de exemple"/>
-<gentext key="listofexamples" text="List&#259; de exemple"/>
-<gentext key="ListofFigures" text="List&#259; de figuri"/>
-<gentext key="listoffigures" text="List&#259; de figuri"/>
-<gentext key="listoftables" text="List&#259; de tabele"/>
-<gentext key="ListofTables" text="List&#259; de tabele"/>
-<gentext key="ListofUnknown" text="List&#259; de necunoscute"/>
-<gentext key="listofunknown" text="List&#259; de necunoscute"/>
-
-<gentext key="nav-home" text="Acas&#259;"/>
-<gentext key="nav-next" text="&#206;nainte"/>
-<gentext key="nav-next-sibling" text="Repede &#239;nainte"/>
-<gentext key="nav-prev" text="&#206;napoi"/>
-<gentext key="nav-prev-sibling" text="Repede &#238;napoi"/>
+<gentext key="xrefto" text="referință către"/>
+
+<gentext key="listofequations" text="Listă de ecuații"/>
+<gentext key="ListofEquations" text="Listă de ecuații"/>
+<gentext key="ListofExamples" text="Listă de exemple"/>
+<gentext key="listofexamples" text="Listă de exemple"/>
+<gentext key="ListofFigures" text="Listă de figuri"/>
+<gentext key="listoffigures" text="Listă de figuri"/>
+<gentext key="listoftables" text="Listă de tabele"/>
+<gentext key="ListofTables" text="Listă de tabele"/>
+<gentext key="ListofUnknown" text="Listă de necunoscute"/>
+<gentext key="listofunknown" text="Listă de necunoscute"/>
+
+<gentext key="nav-home" text="Acasă"/>
+<gentext key="nav-next" text="Înainte"/>
+<gentext key="nav-next-sibling" text="Repede ïnainte"/>
+<gentext key="nav-prev" text="Înapoi"/>
+<gentext key="nav-prev-sibling" text="Repede înapoi"/>
 <gentext key="nav-up" text="Sus"/>
 
-<gentext key="sectioncalled" text="sec&#539;iunea numit&#259;"/>
-<gentext key="Draft"         text="Ciorn&#259;"/>
-<gentext key="above"         text="deasupra"/>
-<gentext key="below"         text="sub"/>
+<gentext key="sectioncalled" text="secțiunea numită"/>
+<gentext key="Draft" text="Ciornă"/>
+<gentext key="above" text="deasupra"/>
+<gentext key="below" text="sub"/>
 <gentext key="index symbols" text="Simboluri"/>
 
-<gentext key="lowercase.alpha" text="a&#259;&#226;bcdefghi&#238;jklmnopqrs&#537;t&#537;uvwxyz"/>
-<gentext key="uppercase.alpha" text="A&#258;&#194;BCDEFGHI&#206;JKLMNOPQRS&#536;T&#538;UVWXYZ"/>
+<gentext key="lowercase.alpha" text="aăâbcdefghiîjklmnopqrsștșuvwxyz"/>
+<gentext key="uppercase.alpha" text="AĂÂBCDEFGHIÎJKLMNOPQRSȘTȚUVWXYZ"/>
 
-<dingbat key="startquote" text="&#x201E;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x00AB;"/>
-<dingbat key="nestedendquote" text="&#x00BB;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="„"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="«"/>
+<dingbat key="nestedendquote" text="»"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
diff --git a/gentext/locale/ru.xml b/gentext/locale/ru.xml
index 96bf231c5..0a6cdf0d2 100644
--- a/gentext/locale/ru.xml
+++ b/gentext/locale/ru.xml
@@ -1,15 +1,10 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % cyr1 PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isocyr1.ent">
-%cyr1;
-]>
 <locale language="ru"
         english-language-name="Russian"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 <authorgroup>
     <author><firstname>Vitaly</firstname><surname>Ostanin</surname>
           <affiliation><address><email>vyt@vzljot.ru</email></address>
@@ -18,143 +13,143 @@
 </authorgroup>
 </doc:localeinfo>
 
-<gentext key="Abstract" text="&Acy;&ncy;&ncy;&ocy;&tcy;&acy;&tscy;&icy;&yacy;"/>
-<gentext key="abstract" text="&Acy;&ncy;&ncy;&ocy;&tcy;&acy;&tscy;&icy;&yacy;"/>
-<gentext key="Answer" text="&Ocy;:"/>
-<gentext key="answer" text="&Ocy;:"/>
-<gentext key="Appendix" text="&Pcy;&rcy;&icy;&lcy;&ocy;&zhcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="appendix" text="&pcy;&rcy;&icy;&lcy;&ocy;&zhcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="Appendix.abr" text="&Pcy;&rcy;&icy;&lcy;."/>
-<gentext key="appendix.abr" text="&Pcy;&rcy;&icy;&lcy;."/>
-<gentext key="Article" text="&Scy;&tcy;&acy;&tcy;&softcy;&yacy;"/>
-<gentext key="article" text="&Scy;&tcy;&acy;&tcy;&softcy;&yacy;"/>
-<gentext key="Audience" text="&Acy;&ucy;&dcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy;"/>
-<gentext key="audience" text="&Acy;&ucy;&dcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy;"/>
-<gentext key="Author" text="&Acy;&vcy;&tcy;&ocy;&rcy;"/>
-<gentext key="Bibliography" text="&Lcy;&icy;&tcy;&iecy;&rcy;&acy;&tcy;&ucy;&rcy;&acy;"/>
-<gentext key="bibliography" text="&Lcy;&icy;&tcy;&iecy;&rcy;&acy;&tcy;&ucy;&rcy;&acy;"/>
-<gentext key="Book" text="&Kcy;&ncy;&icy;&gcy;&acy;"/>
-<gentext key="book" text="&Kcy;&ncy;&icy;&gcy;&acy;"/>
-<gentext key="CAUTION" text="&Pcy;&Rcy;&IEcy;&Dcy;&Ocy;&Scy;&Tcy;&IEcy;&Rcy;&IEcy;&ZHcy;&IEcy;&Ncy;&Icy;&IEcy;"/>
-<gentext key="Caution" text="&Pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&iecy;&rcy;&iecy;&zhcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="caution" text="&Pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&iecy;&rcy;&iecy;&zhcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="Chapter" text="&Gcy;&lcy;&acy;&vcy;&acy;"/>
-<gentext key="chapter" text="&gcy;&lcy;&acy;&vcy;&acy;"/>
-<gentext key="Chapter.abr" text="&#x0413;&#x043B;."/>
-<gentext key="chapter.abr" text="&#x0413;&#x043B;."/>
+<gentext key="Abstract" text="Аннотация"/>
+<gentext key="abstract" text="Аннотация"/>
+<gentext key="Answer" text="О:"/>
+<gentext key="answer" text="О:"/>
+<gentext key="Appendix" text="Приложение"/>
+<gentext key="appendix" text="приложение"/>
+<gentext key="Appendix.abr" text="Прил."/>
+<gentext key="appendix.abr" text="Прил."/>
+<gentext key="Article" text="Статья"/>
+<gentext key="article" text="Статья"/>
+<gentext key="Audience" text="Аудитория"/>
+<gentext key="audience" text="Аудитория"/>
+<gentext key="Author" text="Автор"/>
+<gentext key="Bibliography" text="Литература"/>
+<gentext key="bibliography" text="Литература"/>
+<gentext key="Book" text="Книга"/>
+<gentext key="book" text="Книга"/>
+<gentext key="CAUTION" text="ПРЕДОСТЕРЕЖЕНИЕ"/>
+<gentext key="Caution" text="Предостережение"/>
+<gentext key="caution" text="Предостережение"/>
+<gentext key="Chapter" text="Глава"/>
+<gentext key="chapter" text="глава"/>
+<gentext key="Chapter.abr" text="Гл."/>
+<gentext key="chapter.abr" text="Гл."/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
 <gentext key="copyright" text="Copyright"/> <!-- en -->
-<gentext key="Dedication" text="&Pcy;&ocy;&scy;&vcy;&yacy;&shchcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="dedication" text="&Pcy;&ocy;&scy;&vcy;&yacy;&shchcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="Edition" text="&Rcy;&iecy;&dcy;&acy;&kcy;&tscy;&icy;&yacy;"/>
-<gentext key="edition" text="&Rcy;&iecy;&dcy;&acy;&kcy;&tscy;&icy;&yacy;"/>
-<gentext key="Equation" text="&Fcy;&ocy;&rcy;&mcy;&ucy;&lcy;&acy;"/>
-<gentext key="equation" text="&Fcy;&ocy;&rcy;&mcy;&ucy;&lcy;&acy;"/>
-<gentext key="Equation.abr" text="&Fcy;."/>
-<gentext key="equation.abr" text="&Fcy;."/>
-<gentext key="Example" text="&Pcy;&rcy;&icy;&mcy;&iecy;&rcy;"/>
-<gentext key="example" text="&Pcy;&rcy;&icy;&mcy;&iecy;&rcy;"/>
-<gentext key="Example.abr" text="&Pcy;&rcy;&icy;&mcy;."/>
-<gentext key="example.abr" text="&Pcy;&rcy;&icy;&mcy;."/>
-<gentext key="Figure" text="&Rcy;&icy;&scy;&ucy;&ncy;&ocy;&kcy;"/>
-<gentext key="figure" text="&Rcy;&icy;&scy;&ucy;&ncy;&ocy;&kcy;"/>
-<gentext key="Figure.abr" text="&Rcy;&icy;&scy;."/>
-<gentext key="figure.abr" text="&Rcy;&icy;&scy;."/>
-<gentext key="Glossary" text="&Gcy;&lcy;&ocy;&scy;&scy;&acy;&rcy;&icy;&jcy;"/>
-<gentext key="glossary" text="&Gcy;&lcy;&ocy;&scy;&scy;&acy;&rcy;&icy;&jcy;"/>
-<gentext key="GlossSee" text="&Scy;&mcy;."/>
-<gentext key="glosssee" text="&Scy;&mcy;."/>
-<gentext key="GlossSeeAlso" text="&Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;"/>
-<gentext key="glossseealso" text="&Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;"/>
-<gentext key="IMPORTANT" text="&Vcy;&Acy;&ZHcy;&Ncy;&Ocy;"/>
-<gentext key="Important" text="&Vcy;&acy;&zhcy;&ncy;&ocy;"/>
-<gentext key="important" text="&Vcy;&acy;&zhcy;&ncy;&ocy;"/>
-<gentext key="Index" text="&Pcy;&rcy;&iecy;&dcy;&mcy;&iecy;&tcy;&ncy;&ycy;&jcy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;"/>
-<gentext key="index" text="&Pcy;&rcy;&iecy;&dcy;&mcy;&iecy;&tcy;&ncy;&ycy;&jcy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;"/>
+<gentext key="Dedication" text="Посвящение"/>
+<gentext key="dedication" text="Посвящение"/>
+<gentext key="Edition" text="Редакция"/>
+<gentext key="edition" text="Редакция"/>
+<gentext key="Equation" text="Формула"/>
+<gentext key="equation" text="Формула"/>
+<gentext key="Equation.abr" text="Ф."/>
+<gentext key="equation.abr" text="Ф."/>
+<gentext key="Example" text="Пример"/>
+<gentext key="example" text="Пример"/>
+<gentext key="Example.abr" text="Прим."/>
+<gentext key="example.abr" text="Прим."/>
+<gentext key="Figure" text="Рисунок"/>
+<gentext key="figure" text="Рисунок"/>
+<gentext key="Figure.abr" text="Рис."/>
+<gentext key="figure.abr" text="Рис."/>
+<gentext key="Glossary" text="Глоссарий"/>
+<gentext key="glossary" text="Глоссарий"/>
+<gentext key="GlossSee" text="См."/>
+<gentext key="glosssee" text="См."/>
+<gentext key="GlossSeeAlso" text="См. также"/>
+<gentext key="glossseealso" text="См. также"/>
+<gentext key="IMPORTANT" text="ВАЖНО"/>
+<gentext key="Important" text="Важно"/>
+<gentext key="important" text="Важно"/>
+<gentext key="Index" text="Предметный указатель"/>
+<gentext key="index" text="Предметный указатель"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="ISBN"/> <!-- en -->
-<gentext key="LegalNotice" text="&Acy;&vcy;&tcy;&ocy;&rcy;&scy;&kcy;&icy;&iecy; &pcy;&rcy;&acy;&vcy;&acy;"/>
-<gentext key="legalnotice" text="&Acy;&vcy;&tcy;&ocy;&rcy;&scy;&kcy;&icy;&iecy; &pcy;&rcy;&acy;&vcy;&acy;"/>
-<gentext key="Level" text="&Ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy;"/>
-<gentext key="level" text="&Ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy;"/>
+<gentext key="LegalNotice" text="Авторские права"/>
+<gentext key="legalnotice" text="Авторские права"/>
+<gentext key="Level" text="Уровень"/>
+<gentext key="level" text="Уровень"/>
 <gentext key="MsgAud" text="Audience"/>
 <gentext key="msgaud" text="Audience"/> <!-- en -->
 <gentext key="MsgLevel" text="Level"/>
 <gentext key="msglevel" text="Level"/> <!-- en -->
 <gentext key="MsgOrig" text="Origin"/>
 <gentext key="msgorig" text="Origin"/> <!-- en -->
-<gentext key="Name" text="&Icy;&mcy;&yacy;"/>
-<gentext key="name" text="&Icy;&mcy;&yacy;"/>
-<gentext key="NOTE" text="&Zcy;&Acy;&Mcy;&IEcy;&CHcy;&Acy;&Ncy;&Icy;&IEcy;"/>
-<gentext key="Note" text="&Zcy;&acy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="note" text="&Zcy;&acy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="Origin" text="&Icy;&scy;&tcy;&ocy;&chcy;&ncy;&icy;&kcy;"/>
-<gentext key="origin" text="&Icy;&scy;&tcy;&ocy;&chcy;&ncy;&icy;&kcy;"/>
-<gentext key="Part" text="&CHcy;&acy;&scy;&tcy;&softcy;"/>
-<gentext key="part" text="&CHcy;&acy;&scy;&tcy;&softcy;"/>
-<gentext key="Part.abr" text="&CHcy;."/>
-<gentext key="part.abr" text="&CHcy;."/>
-<gentext key="Preface" text="&Pcy;&rcy;&iecy;&dcy;&icy;&scy;&lcy;&ocy;&vcy;&icy;&iecy;"/>
-<gentext key="preface" text="&Pcy;&rcy;&iecy;&dcy;&icy;&scy;&lcy;&ocy;&vcy;&icy;&iecy;"/>
-<gentext key="Procedure" text="&Pcy;&rcy;&ocy;&tscy;&iecy;&dcy;&ucy;&rcy;&acy;"/>
-<gentext key="procedure" text="&Pcy;&rcy;&ocy;&tscy;&iecy;&dcy;&ucy;&rcy;&acy;"/>
-<gentext key="Procedure.abr" text="&Pcy;&rcy;&ocy;&tscy;."/>
-<gentext key="procedure.abr" text="&Pcy;&rcy;&ocy;&tscy;."/>
+<gentext key="Name" text="Имя"/>
+<gentext key="name" text="Имя"/>
+<gentext key="NOTE" text="ЗАМЕЧАНИЕ"/>
+<gentext key="Note" text="Замечание"/>
+<gentext key="note" text="Замечание"/>
+<gentext key="Origin" text="Источник"/>
+<gentext key="origin" text="Источник"/>
+<gentext key="Part" text="Часть"/>
+<gentext key="part" text="Часть"/>
+<gentext key="Part.abr" text="Ч."/>
+<gentext key="part.abr" text="Ч."/>
+<gentext key="Preface" text="Предисловие"/>
+<gentext key="preface" text="Предисловие"/>
+<gentext key="Procedure" text="Процедура"/>
+<gentext key="procedure" text="Процедура"/>
+<gentext key="Procedure.abr" text="Проц."/>
+<gentext key="procedure.abr" text="Проц."/>
 <gentext key="ProductionSet" text="Production"/> <!-- en -->
-<gentext key="Published" text="&Ocy;&pcy;&ucy;&bcy;&lcy;&icy;&kcy;&ocy;&vcy;&acy;&ncy;&ocy;"/>
-<gentext key="published" text="&Ocy;&pcy;&ucy;&bcy;&lcy;&icy;&kcy;&ocy;&vcy;&acy;&ncy;&ocy;"/>
-<gentext key="Qandadiv" text="&Vcy; &icy; &Ocy;"/>
-<gentext key="qandadiv" text="&Vcy; &icy; &Ocy;"/>
-<gentext key="Question" text="&Vcy;:"/>
-<gentext key="question" text="&Vcy;:"/>
+<gentext key="Published" text="Опубликовано"/>
+<gentext key="published" text="Опубликовано"/>
+<gentext key="Qandadiv" text="В и О"/>
+<gentext key="qandadiv" text="В и О"/>
+<gentext key="Question" text="В:"/>
+<gentext key="question" text="В:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="Reference" text="&Scy;&scy;&ycy;&lcy;&kcy;&acy;"/>
-<gentext key="reference" text="&Scy;&scy;&ycy;&lcy;&kcy;&acy;"/>
-<gentext key="RefName" text="&Ncy;&acy;&zcy;&vcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="refname" text="&Ncy;&acy;&zcy;&vcy;&acy;&ncy;&icy;&iecy;"/>
+<gentext key="Reference" text="Ссылка"/>
+<gentext key="reference" text="Ссылка"/>
+<gentext key="RefName" text="Название"/>
+<gentext key="refname" text="Название"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
-<gentext key="RefSynopsisDiv" text="&Scy;&icy;&ncy;&tcy;&acy;&kcy;&scy;&icy;&scy;"/>
-<gentext key="refsynopsisdiv" text="&Scy;&icy;&ncy;&tcy;&acy;&kcy;&scy;&icy;&scy;"/>
-<gentext key="RevHistory" text="&Icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&icy;&zcy;&dcy;&acy;&ncy;&icy;&yacy;"/>
-<gentext key="revhistory" text="&Icy;&scy;&tcy;&ocy;&rcy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&icy;&zcy;&dcy;&acy;&ncy;&icy;&yacy;"/>
-<gentext key="Revision" text="&Icy;&zcy;&dcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="revision" text="&Icy;&zcy;&dcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="sect1" text="&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="sect2" text="&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="sect3" text="&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="sect4" text="&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="sect5" text="&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="Section" text="&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="section" text="&rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="Section.abr" text="&Rcy;&acy;&zcy;&dcy;."/>
-<gentext key="section.abr" text="&Rcy;&acy;&zcy;&dcy;."/>
-<gentext key="See" text="&Scy;&mcy;."/>
-<gentext key="see" text="&Scy;&mcy;."/>
-<gentext key="SeeAlso" text="&Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;"/>
-<gentext key="Seealso" text="&Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;"/>
-<gentext key="seealso" text="&Scy;&mcy;. &tcy;&acy;&kcy;&zhcy;&iecy;"/>
-<gentext key="Set" text="&Pcy;&ocy;&dcy;&bcy;&ocy;&rcy;&kcy;&acy;"/>
-<gentext key="set" text="&Pcy;&ocy;&dcy;&bcy;&ocy;&rcy;&kcy;&acy;"/>
-<gentext key="SetIndex" text="&Icy;&ncy;&dcy;&iecy;&kcy;&scy; &pcy;&ocy;&dcy;&bcy;&ocy;&rcy;&kcy;&icy;"/>
-<gentext key="setindex" text="&Icy;&ncy;&dcy;&iecy;&kcy;&scy; &pcy;&ocy;&dcy;&bcy;&ocy;&rcy;&kcy;&icy;"/>
-<gentext key="Sidebar" text="&Vcy;&ycy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="sidebar" text="&vcy;&ycy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="Step" text="&SHcy;&acy;&gcy;"/>
-<gentext key="step" text="&shcy;&acy;&gcy;"/>
-<gentext key="Table" text="&Tcy;&acy;&bcy;&lcy;&icy;&tscy;&acy;"/>
-<gentext key="table" text="&Tcy;&acy;&bcy;&lcy;&icy;&tscy;&acy;"/>
-<gentext key="Table.abr" text="&Tcy;&acy;&bcy;&lcy;."/>
-<gentext key="table.abr" text="&Tcy;&acy;&bcy;&lcy;."/>
-<gentext key="TIP" text="&Pcy;&Ocy;&Dcy;&Scy;&Kcy;&Acy;&Zcy;&Kcy;&Acy;"/>
-<gentext key="Tip" text="&Pcy;&ocy;&dcy;&scy;&kcy;&acy;&zcy;&kcy;&acy;"/>
-<gentext key="tip" text="&Pcy;&ocy;&dcy;&scy;&kcy;&acy;&zcy;&kcy;&acy;"/>
-<gentext key="WARNING" text="&Vcy;&Ncy;&Icy;&Mcy;&Acy;&Ncy;&Icy;&IEcy;"/>
-<gentext key="Warning" text="&Vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="warning" text="&Vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;"/>
+<gentext key="RefSynopsisDiv" text="Синтаксис"/>
+<gentext key="refsynopsisdiv" text="Синтаксис"/>
+<gentext key="RevHistory" text="История переиздания"/>
+<gentext key="revhistory" text="История переиздания"/>
+<gentext key="Revision" text="Издание"/>
+<gentext key="revision" text="Издание"/>
+<gentext key="sect1" text="Раздел"/>
+<gentext key="sect2" text="Раздел"/>
+<gentext key="sect3" text="Раздел"/>
+<gentext key="sect4" text="Раздел"/>
+<gentext key="sect5" text="Раздел"/>
+<gentext key="Section" text="Раздел"/>
+<gentext key="section" text="раздел"/>
+<gentext key="Section.abr" text="Разд."/>
+<gentext key="section.abr" text="Разд."/>
+<gentext key="See" text="См."/>
+<gentext key="see" text="См."/>
+<gentext key="SeeAlso" text="См. также"/>
+<gentext key="Seealso" text="См. также"/>
+<gentext key="seealso" text="См. также"/>
+<gentext key="Set" text="Подборка"/>
+<gentext key="set" text="Подборка"/>
+<gentext key="SetIndex" text="Индекс подборки"/>
+<gentext key="setindex" text="Индекс подборки"/>
+<gentext key="Sidebar" text="Выделение"/>
+<gentext key="sidebar" text="выделение"/>
+<gentext key="Step" text="Шаг"/>
+<gentext key="step" text="шаг"/>
+<gentext key="Table" text="Таблица"/>
+<gentext key="table" text="Таблица"/>
+<gentext key="Table.abr" text="Табл."/>
+<gentext key="table.abr" text="Табл."/>
+<gentext key="TIP" text="ПОДСКАЗКА"/>
+<gentext key="Tip" text="Подсказка"/>
+<gentext key="tip" text="Подсказка"/>
+<gentext key="WARNING" text="ВНИМАНИЕ"/>
+<gentext key="Warning" text="Внимание"/>
+<gentext key="warning" text="Внимание"/>
 
 <gentext key="and" text=""/> <!-- as far as it's seen "and" is used only in 
                                the list of author names, but "and" in such 
@@ -163,25 +158,25 @@
 
 <gentext key="by" text=""/>
 <gentext key="called" text=""/>
-<gentext key="edited" text="&Pcy;&ocy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&icy;&iecy;&jcy;"/>
-<gentext key="Edited" text="&Pcy;&ocy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&icy;&iecy;&jcy;"/>
-<gentext key="Editedby" text="&Pcy;&ocy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&icy;&iecy;&jcy;"/>
-<gentext key="editedby" text="&Pcy;&ocy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&icy;&iecy;&jcy;"/>
-<gentext key="in" text="&vcy;"/>
-<gentext key="TableofContents" text="&Scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="tableofcontents" text="&Scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&icy;&iecy;"/>
+<gentext key="edited" text="Под редакцией"/>
+<gentext key="Edited" text="Под редакцией"/>
+<gentext key="Editedby" text="Под редакцией"/>
+<gentext key="editedby" text="Под редакцией"/>
+<gentext key="in" text="в"/>
+<gentext key="TableofContents" text="Содержание"/>
+<gentext key="tableofcontents" text="Содержание"/>
 <gentext key="lastlistcomma" text=","/>
 <gentext key="listcomma" text=","/>
-<gentext key="Notes" text="&Pcy;&rcy;&icy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&yacy;"/>
-<gentext key="notes" text="&Pcy;&rcy;&icy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&yacy;"/>
-<gentext key="TableNotes" text="&Pcy;&rcy;&icy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&yacy;"/>
-<gentext key="tablenotes" text="&Pcy;&rcy;&icy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&yacy;"/>
+<gentext key="Notes" text="Примечания"/>
+<gentext key="notes" text="Примечания"/>
+<gentext key="TableNotes" text="Примечания"/>
+<gentext key="tablenotes" text="Примечания"/>
 
 <!-- Suggestion of I. Kouznetsov: Error messages are better in English -->
 
 <gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="pgs" text="&Scy;&tcy;&rcy;."/>
-<gentext key="Pgs" text="&Scy;&tcy;&rcy;."/>
+<gentext key="pgs" text="Стр."/>
+<gentext key="Pgs" text="Стр."/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
 <gentext key="the" text=""/>
@@ -189,40 +184,40 @@
 <gentext key="unsupported" text="unsupported"/>
 <gentext key="xrefto" text="xref to"/>
 
-<gentext key="listofequations" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &fcy;&ocy;&rcy;&mcy;&ucy;&lcy;"/>
-<gentext key="ListofEquations" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &fcy;&ocy;&rcy;&mcy;&ucy;&lcy;"/>
-<gentext key="ListofExamples" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&ocy;&vcy;"/>
-<gentext key="listofexamples" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&ocy;&vcy;"/>
-<gentext key="ListofFigures" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &icy;&lcy;&lcy;&yucy;&scy;&tcy;&rcy;&acy;&tscy;&icy;&jcy;"/>
-<gentext key="listoffigures" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &icy;&lcy;&lcy;&yucy;&scy;&tcy;&rcy;&acy;&tscy;&icy;&jcy;"/>
-<gentext key="listoftables" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &tcy;&acy;&bcy;&lcy;&icy;&tscy;"/>
-<gentext key="ListofTables" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &tcy;&acy;&bcy;&lcy;&icy;&tscy;"/>
-<gentext key="ListofUnknown" text="&Ncy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy;"/>
-<gentext key="listofunknown" text="&Ncy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy;"/>
-
-<gentext key="nav-next" text="&#x0421;&#x043B;&#x0435;&#x0434;."/>
-<gentext key="nav-next-sibling" text="&Scy;&lcy;&iecy;&dcy;. &pcy;&ocy;&dcy;&rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="nav-prev" text="&Pcy;&rcy;&iecy;&dcy;."/>
-<gentext key="nav-prev-sibling" text="&Pcy;&rcy;&iecy;&dcy;. &pcy;&ocy;&dcy;&rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="x-nav-next" text="&Scy;&lcy;&iecy;&dcy;."/>
-
-<gentext key="nav-home" text="&Ncy;&acy;&chcy;&acy;&lcy;&ocy;"/>
-<gentext key="nav-up" text="&Ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy; &vcy;&ycy;&shcy;&iecy;"/>
+<gentext key="listofequations" text="Список формул"/>
+<gentext key="ListofEquations" text="Список формул"/>
+<gentext key="ListofExamples" text="Список примеров"/>
+<gentext key="listofexamples" text="Список примеров"/>
+<gentext key="ListofFigures" text="Список иллюстраций"/>
+<gentext key="listoffigures" text="Список иллюстраций"/>
+<gentext key="listoftables" text="Список таблиц"/>
+<gentext key="ListofTables" text="Список таблиц"/>
+<gentext key="ListofUnknown" text="Неопределенный список"/>
+<gentext key="listofunknown" text="Неопределенный список"/>
+
+<gentext key="nav-next" text="След."/>
+<gentext key="nav-next-sibling" text="След. подраздел"/>
+<gentext key="nav-prev" text="Пред."/>
+<gentext key="nav-prev-sibling" text="Пред. подраздел"/>
+<gentext key="x-nav-next" text="След."/>
+
+<gentext key="nav-home" text="Начало"/>
+<gentext key="nav-up" text="Уровень выше"/>
 
 <gentext key="sectioncalled" text="the section called"/> <!-- en -->
-<gentext key="Draft"         text="&CHcy;&iecy;&rcy;&ncy;&ocy;&vcy;&icy;&kcy;"/>
-<gentext key="above"         text="&vcy;&ycy;&shcy;&iecy;"/>
-<gentext key="below"         text="&ncy;&icy;&zhcy;&iecy;"/>
+<gentext key="Draft" text="Черновик"/>
+<gentext key="above" text="выше"/>
+<gentext key="below" text="ниже"/>
 <gentext key="index symbols" text="Symbols"/> <!-- en -->
 
-<gentext key="lowercase.alpha" text="&acy;&bcy;&vcy;&gcy;&dcy;&iecy;&iocy;&zhcy;&zcy;&icy;&jcy;&kcy;&lcy;&mcy;&ncy;&ocy;&pcy;&rcy;&scy;&tcy;&ucy;&fcy;&khcy;&tscy;&chcy;&shcy;&shchcy;&hardcy;&ycy;&softcy;&ecy;&yucy;&yacy;"/>
-<gentext key="uppercase.alpha" text="&Acy;&Bcy;&Vcy;&Gcy;&Dcy;&IEcy;&IOcy;&ZHcy;&Zcy;&Icy;&Jcy;&Kcy;&Lcy;&Mcy;&Ncy;&Ocy;&Pcy;&Rcy;&Scy;&Tcy;&Ucy;&Fcy;&KHcy;&TScy;&CHcy;&SHcy;&SHCHcy;&HARDcy;&Ycy;&SOFTcy;&Ecy;&YUcy;&YAcy;"/>
+<gentext key="lowercase.alpha" text="абвгдеёжзийклмнопрстуфхцчшщъыьэюя"/>
+<gentext key="uppercase.alpha" text="АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"/>
 
-<dingbat key="startquote" text="&#x00AB;"/>
-<dingbat key="endquote" text="&#x00BB;"/>
-<dingbat key="nestedstartquote" text="&#x201E;"/>
-<dingbat key="nestedendquote" text="&#x201C;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="«"/>
+<dingbat key="endquote" text="»"/>
+<dingbat key="nestedstartquote" text="„"/>
+<dingbat key="nestedendquote" text="“"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
@@ -528,47 +523,47 @@
 </context>
 
 <context name="datetime-full">
-<template name="January">&yacy;&ncy;&vcy;&acy;&rcy;&yacy;</template>
-<template name="February">&fcy;&iecy;&vcy;&rcy;&acy;&lcy;&yacy;</template>
-<template name="March">&mcy;&acy;&rcy;&tcy;&acy;</template>
-<template name="April">&acy;&pcy;&rcy;&iecy;&lcy;&yacy;</template>
-<template name="May">&mcy;&acy;&yacy;</template>
-<template name="June">&icy;&yucy;&ncy;&yacy;</template>
-<template name="July">&icy;&yucy;&lcy;&yacy;</template>
-<template name="August">&acy;&vcy;&gcy;&ucy;&scy;&tcy;&acy;</template>
-<template name="September">&scy;&iecy;&ncy;&tcy;&yacy;&bcy;&rcy;&yacy;</template>
-<template name="October">&ocy;&kcy;&tcy;&yacy;&bcy;&rcy;&yacy;</template>
-<template name="November">&ncy;&ocy;&yacy;&bcy;&rcy;&yacy;</template>
-<template name="December">&dcy;&iecy;&kcy;&acy;&bcy;&rcy;&yacy;</template>
-<template name="Monday">&pcy;&ocy;&ncy;&iecy;&dcy;&iecy;&lcy;&softcy;&ncy;&icy;&kcy;</template>
-<template name="Tuesday">&vcy;&tcy;&ocy;&rcy;&ncy;&icy;&kcy;</template>
-<template name="Wednesday">&scy;&rcy;&iecy;&dcy;&acy;</template>
-<template name="Thursday">&chcy;&iecy;&tcy;&vcy;&ecy;&rcy;&gcy;</template>
-<template name="Friday">&pcy;&yacy;&tcy;&ncy;&icy;&tscy;&acy;</template>
-<template name="Saturday">&scy;&ucy;&bcy;&bcy;&ocy;&tcy;&acy;</template>
-<template name="Sunday">&vcy;&ocy;&scy;&kcy;&rcy;&iecy;&scy;&iecy;&ncy;&softcy;&iecy;</template>
+<template name="January">января</template>
+<template name="February">февраля</template>
+<template name="March">марта</template>
+<template name="April">апреля</template>
+<template name="May">мая</template>
+<template name="June">июня</template>
+<template name="July">июля</template>
+<template name="August">августа</template>
+<template name="September">сентября</template>
+<template name="October">октября</template>
+<template name="November">ноября</template>
+<template name="December">декабря</template>
+<template name="Monday">понедельник</template>
+<template name="Tuesday">вторник</template>
+<template name="Wednesday">среда</template>
+<template name="Thursday">четвэрг</template>
+<template name="Friday">пятница</template>
+<template name="Saturday">суббота</template>
+<template name="Sunday">воскресенье</template>
 </context>
 
 <context name="datetime-abbrev">
-<template name="Jan">&YAcy;&ncy;&vcy;</template>
-<template name="Feb">&Fcy;&iecy;&vcy;</template>
-<template name="Mar">&Mcy;&acy;&rcy;</template>
-<template name="Apr">&Acy;&pcy;&rcy;</template>
-<template name="May">&Mcy;&acy;&jcy;</template>
-<template name="Jun">&Icy;&yucy;&ncy;</template>
-<template name="Jul">&Icy;&yucy;&lcy;</template>
-<template name="Aug">&Acy;&vcy;&gcy;</template>
-<template name="Sep">&Scy;&iecy;&ncy;</template>
-<template name="Oct">&Ocy;&kcy;&tcy;</template>
-<template name="Nov">&Ncy;&ocy;&yacy;</template>
-<template name="Dec">&Dcy;&iecy;&kcy;</template>
-<template name="Mon">&Pcy;&ncy;&dcy;</template>
-<template name="Tue">&Vcy;&tcy;&rcy;</template>
-<template name="Wed">&Scy;&rcy;&dcy;</template>
-<template name="Thu">&CHcy;&tcy;&vcy;</template>
-<template name="Fri">&Pcy;&tcy;&ncy;</template>
-<template name="Sat">&Scy;&bcy;&tcy;</template>
-<template name="Sun">&Vcy;&scy;&kcy;</template>
+<template name="Jan">Янв</template>
+<template name="Feb">Фев</template>
+<template name="Mar">Мар</template>
+<template name="Apr">Апр</template>
+<template name="May">Май</template>
+<template name="Jun">Июн</template>
+<template name="Jul">Июл</template>
+<template name="Aug">Авг</template>
+<template name="Sep">Сен</template>
+<template name="Oct">Окт</template>
+<template name="Nov">Ноя</template>
+<template name="Dec">Дек</template>
+<template name="Mon">Пнд</template>
+<template name="Tue">Втр</template>
+<template name="Wed">Срд</template>
+<template name="Thu">Чтв</template>
+<template name="Fri">Птн</template>
+<template name="Sat">Сбт</template>
+<template name="Sun">Вск</template>
 </context>
 
 <context name="htmlhelp">
@@ -577,7 +572,7 @@
 
 <letters>
 <l i="-1"/>
-<l i="0"></l>  <!-- Russian language doesn't use division name for symbols -->
+<l i="0"/>  <!-- Russian language doesn't use division name for symbols -->
 <l i="10">A</l>
 <l i="10">a</l>
 <l i="20">B</l>
@@ -630,72 +625,72 @@
 <l i="250">y</l>
 <l i="260">Z</l>
 <l i="260">z</l>
-<l i="270">&#1040;</l>
-<l i="270">&#1072;</l>
-<l i="280">&#1041;</l>
-<l i="280">&#1073;</l>
-<l i="290">&#1042;</l>
-<l i="290">&#1074;</l>
-<l i="300">&#1043;</l>
-<l i="300">&#1075;</l>
-<l i="310">&#1044;</l>
-<l i="310">&#1076;</l>
-<l i="320">&#1045;</l>
-<l i="320">&#1077;</l>
-<l i="320">&#1025;</l>
-<l i="320">&#1105;</l>
-<l i="330">&#1046;</l>
-<l i="330">&#1078;</l>
-<l i="340">&#1047;</l>
-<l i="340">&#1079;</l>
-<l i="350">&#1048;</l>
-<l i="350">&#1080;</l>
-<l i="360">&#1049;</l>
-<l i="360">&#1081;</l>
-<l i="370">&#1050;</l>
-<l i="370">&#1082;</l>
-<l i="380">&#1051;</l>
-<l i="380">&#1083;</l>
-<l i="390">&#1052;</l>
-<l i="390">&#1084;</l>
-<l i="400">&#1053;</l>
-<l i="400">&#1085;</l>
-<l i="410">&#1054;</l>
-<l i="410">&#1086;</l>
-<l i="420">&#1055;</l>
-<l i="420">&#1087;</l>
-<l i="430">&#1056;</l>
-<l i="430">&#1088;</l>
-<l i="440">&#1057;</l>
-<l i="440">&#1089;</l>
-<l i="450">&#1058;</l>
-<l i="450">&#1090;</l>
-<l i="460">&#1059;</l>
-<l i="460">&#1091;</l>
-<l i="470">&#1060;</l>
-<l i="470">&#1092;</l>
-<l i="480">&#1061;</l>
-<l i="480">&#1093;</l>
-<l i="490">&#1062;</l>
-<l i="490">&#1094;</l>
-<l i="500">&#1063;</l>
-<l i="500">&#1095;</l>
-<l i="510">&#1064;</l>
-<l i="510">&#1096;</l>
-<l i="520">&#1065;</l>
-<l i="520">&#1097;</l>
-<l i="530">&#1066;</l>
-<l i="530">&#1098;</l>
-<l i="540">&#1067;</l>
-<l i="540">&#1099;</l>
-<l i="550">&#1068;</l>
-<l i="550">&#1100;</l>
-<l i="560">&#1069;</l>
-<l i="560">&#1101;</l>
-<l i="570">&#1070;</l>
-<l i="570">&#1102;</l>
-<l i="580">&#1071;</l>
-<l i="580">&#1103;</l>
+<l i="270">А</l>
+<l i="270">а</l>
+<l i="280">Б</l>
+<l i="280">б</l>
+<l i="290">В</l>
+<l i="290">в</l>
+<l i="300">Г</l>
+<l i="300">г</l>
+<l i="310">Д</l>
+<l i="310">д</l>
+<l i="320">Е</l>
+<l i="320">е</l>
+<l i="320">Ё</l>
+<l i="320">ё</l>
+<l i="330">Ж</l>
+<l i="330">ж</l>
+<l i="340">З</l>
+<l i="340">з</l>
+<l i="350">И</l>
+<l i="350">и</l>
+<l i="360">Й</l>
+<l i="360">й</l>
+<l i="370">К</l>
+<l i="370">к</l>
+<l i="380">Л</l>
+<l i="380">л</l>
+<l i="390">М</l>
+<l i="390">м</l>
+<l i="400">Н</l>
+<l i="400">н</l>
+<l i="410">О</l>
+<l i="410">о</l>
+<l i="420">П</l>
+<l i="420">п</l>
+<l i="430">Р</l>
+<l i="430">р</l>
+<l i="440">С</l>
+<l i="440">с</l>
+<l i="450">Т</l>
+<l i="450">т</l>
+<l i="460">У</l>
+<l i="460">у</l>
+<l i="470">Ф</l>
+<l i="470">ф</l>
+<l i="480">Ð¥</l>
+<l i="480">х</l>
+<l i="490">Ц</l>
+<l i="490">ц</l>
+<l i="500">Ч</l>
+<l i="500">ч</l>
+<l i="510">Ш</l>
+<l i="510">ш</l>
+<l i="520">Щ</l>
+<l i="520">щ</l>
+<l i="530">Ъ</l>
+<l i="530">ъ</l>
+<l i="540">Ы</l>
+<l i="540">ы</l>
+<l i="550">Ь</l>
+<l i="550">ь</l>
+<l i="560">Э</l>
+<l i="560">э</l>
+<l i="570">Ю</l>
+<l i="570">ю</l>
+<l i="580">Я</l>
+<l i="580">я</l>
 </letters>
 
 
diff --git a/gentext/locale/uk.xml b/gentext/locale/uk.xml
index b6e890fdf..87f5c1155 100644
--- a/gentext/locale/uk.xml
+++ b/gentext/locale/uk.xml
@@ -1,19 +1,10 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!-- there is no doctype for these files, they are WF only -->
-<!DOCTYPE locale [
-<!ENTITY % cyr1 PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isocyr1.ent">
-<!ENTITY % cyr2 PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
-                "http://www.w3.org/2003/entities/iso8879/isocyr2.ent">
-%cyr1;
-%cyr2;
-
-]>
 <locale language="uk"
         english-language-name="Ukrainian"
         xmlns:doc="http://nwalsh.com/xsl/documentation/1.0">
 
-<doc:localeinfo xmlns="">
+<doc:localeinfo>
 
 <authorgroup>
   <author><firstname>Olexij</firstname><surname>Tkatchenko</surname>
@@ -25,202 +16,202 @@
 </doc:localeinfo>
 
 
-<gentext key="Abstract" text="&Acy;&ncy;&ocy;&tcy;&acy;&tscy;&iukcy;&yacy;"/>
-<gentext key="abstract" text="&Acy;&ncy;&ocy;&tcy;&acy;&tscy;&iukcy;&yacy;"/>
-<gentext key="Answer" text="&Vcy;:"/>
-<gentext key="answer" text="&vcy;:"/>
-<gentext key="Appendix" text="&Dcy;&ocy;&dcy;&acy;&tcy;&ocy;&kcy;"/>
-<gentext key="appendix" text="&dcy;&ocy;&dcy;&acy;&tcy;&ocy;&kcy;"/>
-<gentext key="Appendix.abr" text="&Dcy;&ocy;&dcy;."/>
-<gentext key="appendix.abr" text="&dcy;&ocy;&dcy;."/>
-<gentext key="Article" text="&Scy;&tcy;&acy;&tcy;&tcy;&yacy;"/>
-<gentext key="article" text="&scy;&tcy;&acy;&tcy;&tcy;&yacy;"/>
-<gentext key="Audience" text="&Acy;&ucy;&dcy;&icy;&tcy;&ocy;&rcy;&iukcy;&yacy;"/>
-<gentext key="audience" text="&Acy;&ucy;&dcy;&icy;&tcy;&ocy;&rcy;&iukcy;&yacy;"/>
-<gentext key="Bibliography" text="&Lcy;&icy;&tcy;&iecy;&rcy;&acy;&tcy;&ucy;&rcy;&acy;"/>
-<gentext key="bibliography" text="&lcy;&icy;&tcy;&iecy;&rcy;&acy;&tcy;&ucy;&rcy;&acy;"/>
-<gentext key="Book" text="&Kcy;&ncy;&icy;&gcy;&acy;"/>
-<gentext key="book" text="&kcy;&ncy;&icy;&gcy;&acy;"/>
-<gentext key="CAUTION" text="&Zcy;&Acy;&Scy;&Tcy;&IEcy;&Rcy;&IEcy;&ZHcy;&IEcy;&Ncy;&Ncy;&YAcy;"/>
-<gentext key="Caution" text="&Zcy;&acy;&scy;&tcy;&iecy;&rcy;&iecy;&zhcy;&iecy;&ncy;&ncy;&yacy;"/>
-<gentext key="caution" text="&zcy;&acy;&scy;&tcy;&iecy;&rcy;&iecy;&zhcy;&iecy;&ncy;&ncy;&yacy;"/>
-<gentext key="Chapter" text="&Rcy;&ocy;&zcy;&dcy;&iukcy;&lcy;"/>
-<gentext key="chapter" text="&rcy;&ocy;&zcy;&dcy;&iukcy;&lcy;"/>
-<gentext key="Chapter.abr" text="&Rcy;&ocy;&zcy;&dcy;."/>
-<gentext key="chapter.abr" text="&rcy;&ocy;&zcy;&dcy;."/>
+<gentext key="Abstract" text="Анотація"/>
+<gentext key="abstract" text="Анотація"/>
+<gentext key="Answer" text="В:"/>
+<gentext key="answer" text="в:"/>
+<gentext key="Appendix" text="Додаток"/>
+<gentext key="appendix" text="додаток"/>
+<gentext key="Appendix.abr" text="Дод."/>
+<gentext key="appendix.abr" text="дод."/>
+<gentext key="Article" text="Стаття"/>
+<gentext key="article" text="стаття"/>
+<gentext key="Audience" text="Аудиторія"/>
+<gentext key="audience" text="Аудиторія"/>
+<gentext key="Bibliography" text="Литература"/>
+<gentext key="bibliography" text="литература"/>
+<gentext key="Book" text="Книга"/>
+<gentext key="book" text="книга"/>
+<gentext key="CAUTION" text="ЗАСТЕРЕЖЕННЯ"/>
+<gentext key="Caution" text="Застереження"/>
+<gentext key="caution" text="застереження"/>
+<gentext key="Chapter" text="Розділ"/>
+<gentext key="chapter" text="розділ"/>
+<gentext key="Chapter.abr" text="Розд."/>
+<gentext key="chapter.abr" text="розд."/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
-<gentext key="Copyright" text="&Acy;&vcy;&tcy;&ocy;&rcy;&scy;&softcy;&kcy;&iecy; &pcy;&rcy;&acy;&vcy;&ocy;"/>
-<gentext key="copyright" text="&acy;&vcy;&tcy;&ocy;&rcy;&scy;&softcy;&kcy;&iecy; &pcy;&rcy;&acy;&vcy;&ocy;"/>
-<gentext key="Dedication" text="&Pcy;&rcy;&icy;&scy;&vcy;&yacy;&chcy;&iecy;&ncy;&ncy;&yacy;"/>
-<gentext key="dedication" text="&pcy;&rcy;&icy;&scy;&vcy;&yacy;&chcy;&iecy;&ncy;&ncy;&yacy;"/>
-<gentext key="Edition" text="&Vcy;&icy;&dcy;&acy;&ncy;&ncy;&yacy;"/>
-<gentext key="edition" text="&vcy;&icy;&dcy;&acy;&ncy;&ncy;&yacy;"/>
-<gentext key="Equation" text="&Fcy;&ocy;&rcy;&mcy;&ucy;&lcy;&acy;"/>
-<gentext key="equation" text="&Fcy;&ocy;&rcy;&mcy;&ucy;&lcy;&acy;"/>
-<gentext key="Equation.abr" text="&Fcy;."/>
-<gentext key="equation.abr" text="&Fcy;."/>
-<gentext key="Example" text="&Pcy;&rcy;&icy;&kcy;&lcy;&acy;&dcy;"/>
-<gentext key="example" text="&pcy;&rcy;&icy;&kcy;&lcy;&acy;&dcy;"/>
-<gentext key="Example.abr" text="&Pcy;&rcy;&icy;&kcy;&lcy;."/>
-<gentext key="example.abr" text="&pcy;&rcy;&icy;&kcy;&lcy;."/>
-<gentext key="Figure" text="&Rcy;&icy;&scy;&ucy;&ncy;&ocy;&kcy;"/>
-<gentext key="figure" text="&Rcy;&icy;&scy;&ucy;&ncy;&ocy;&kcy;"/>
-<gentext key="Figure.abr" text="&Rcy;&icy;&scy;."/>
-<gentext key="figure.abr" text="&Rcy;&icy;&scy;."/>
-<gentext key="Glossary" text="&Gcy;&lcy;&ocy;&scy;&acy;&rcy;&iukcy;&jcy;"/>
-<gentext key="glossary" text="&gcy;&lcy;&ocy;&scy;&acy;&rcy;&iukcy;&jcy;"/>
-<gentext key="GlossSee" text="&Dcy;&icy;&vcy;."/>
-<gentext key="glosssee" text="&dcy;&icy;&vcy;."/>
-<gentext key="GlossSeeAlso"  text="&Dcy;&icy;&vcy;. &tcy;&acy;&kcy;&ocy;&zhcy;"/>
-<gentext key="glossSeeAlso"  text="&dcy;&icy;&vcy;. &tcy;&acy;&kcy;&ocy;&zhcy;"/>
-<gentext key="glossseealso"  text="&dcy;&icy;&vcy;. &tcy;&acy;&kcy;&ocy;&zhcy;"/>
-<gentext key="IMPORTANT" text="&Vcy;&Acy;&ZHcy;&Lcy;&Icy;&Vcy;&Ocy;"/>
-<gentext key="Important" text="&Vcy;&acy;&zhcy;&lcy;&icy;&vcy;&ocy;"/>
-<gentext key="important" text="&vcy;&acy;&zhcy;&lcy;&icy;&vcy;&ocy;"/>
-<gentext key="Index" text="&Pcy;&rcy;&iecy;&dcy;&mcy;&iecy;&tcy;&ncy;&ycy;&jcy; &pcy;&ocy;&kcy;&acy;&zhcy;chcy;&icy;&kcy;"/>
-<gentext key="index" text="&pcy;&rcy;&iecy;&dcy;&mcy;&iecy;&tcy;&ncy;&ycy;&jcy; &pcy;&ocy;&kcy;&acy;&zhcy;chcy;&icy;&kcy;"/>
+<gentext key="Copyright" text="Авторське право"/>
+<gentext key="copyright" text="авторське право"/>
+<gentext key="Dedication" text="Присвячення"/>
+<gentext key="dedication" text="присвячення"/>
+<gentext key="Edition" text="Видання"/>
+<gentext key="edition" text="видання"/>
+<gentext key="Equation" text="Формула"/>
+<gentext key="equation" text="Формула"/>
+<gentext key="Equation.abr" text="Ф."/>
+<gentext key="equation.abr" text="Ф."/>
+<gentext key="Example" text="Приклад"/>
+<gentext key="example" text="приклад"/>
+<gentext key="Example.abr" text="Прикл."/>
+<gentext key="example.abr" text="прикл."/>
+<gentext key="Figure" text="Рисунок"/>
+<gentext key="figure" text="Рисунок"/>
+<gentext key="Figure.abr" text="Рис."/>
+<gentext key="figure.abr" text="Рис."/>
+<gentext key="Glossary" text="Глосарій"/>
+<gentext key="glossary" text="глосарій"/>
+<gentext key="GlossSee" text="Див."/>
+<gentext key="glosssee" text="див."/>
+<gentext key="GlossSeeAlso" text="Див. також"/>
+<gentext key="glossSeeAlso" text="див. також"/>
+<gentext key="glossseealso" text="див. також"/>
+<gentext key="IMPORTANT" text="ВАЖЛИВО"/>
+<gentext key="Important" text="Важливо"/>
+<gentext key="important" text="важливо"/>
+<gentext key="Index" text="Предметный покажchcy;ик"/>
+<gentext key="index" text="предметный покажchcy;ик"/>
 <gentext key="ISBN" text="ISBN"/>
 <gentext key="isbn" text="ISBN"/> <!-- en -->
-<gentext key="LegalNotice" text="&Pcy;&rcy;&acy;&vcy;&ocy;&vcy;&acy; &pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&acy;"/>
-<gentext key="legalnotice" text="&pcy;&rcy;&acy;&vcy;&ocy;&vcy;&acy; &pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&acy;"/>
-<gentext key="Level" text="&Rcy;&iukcy;&vcy;&iecy;&ncy;&softcy;"/>
-<gentext key="level" text="&rcy;&iukcy;&vcy;&iecy;&ncy;&softcy;"/>
-<gentext key="MsgAud" text="&Acy;&ucy;&dcy;&icy;&tcy;&ocy;&rcy;&iukcy;&yacy;"/>
-<gentext key="msgaud" text="&acy;&ucy;&dcy;&icy;&tcy;&ocy;&rcy;&iukcy;&yacy;"/>
-<gentext key="MsgLevel" text="&Rcy;&iukcy;&vcy;&iecy;&ncy;&softcy;"/>
-<gentext key="msglevel" text="&rcy;&iukcy;&vcy;&iecy;&ncy;&softcy;"/>
-<gentext key="MsgOrig" text="&Dcy;&zhcy;&iecy;&rcy;&iecy;&lcy;&ocy;"/>
-<gentext key="msgorig" text="&dcy;&zhcy;&iecy;&rcy;&iecy;&lcy;&ocy;"/>
-<gentext key="Name" text="&Iukcy;&mcy;';&yacy;"/>
-<gentext key="name" text="&iukcy;&mcy;';&yacy;"/>
-<gentext key="NOTE" text="&Pcy;&Rcy;&Icy;&Mcy;&Iukcy;&Tcy;&Kcy;&Acy;"/>
-<gentext key="Note" text="&Pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&acy;"/>
-<gentext key="note" text="&pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&acy;"/>
-<gentext key="Origin" text="&Dcy;&zhcy;&iecy;&rcy;&iecy;&lcy;&ocy;"/>
-<gentext key="origin" text="&dcy;&zhcy;&iecy;&rcy;&iecy;&lcy;&ocy;"/>
-<gentext key="Part" text="&CHcy;&acy;&scy;&tcy;&icy;&ncy;&acy;"/>
-<gentext key="part" text="&chcy;&acy;&scy;&tcy;&icy;&ncy;&acy;"/>
-<gentext key="Part.abr" text="&CHcy;."/>
-<gentext key="part.abr" text="&CHcy;."/>
-<gentext key="Preface" text="&Pcy;&iecy;&rcy;&iecy;&dcy;&mcy;&ocy;&vcy;&acy;"/>
-<gentext key="preface" text="&pcy;&iecy;&rcy;&iecy;&dcy;&mcy;&ocy;&vcy;&acy;"/>
-<gentext key="Procedure" text="&Pcy;&rcy;&ocy;&tscy;&iecy;&dcy;&ucy;&rcy;&acy;"/>
-<gentext key="procedure" text="&Pcy;&rcy;&ocy;&tscy;&iecy;&dcy;&ucy;&rcy;&acy;"/>
-<gentext key="Procedure.abr" text="&Pcy;&rcy;&ocy;&tscy;."/>
-<gentext key="procedure.abr" text="&Pcy;&rcy;&ocy;&tscy;."/>
+<gentext key="LegalNotice" text="Правова примітка"/>
+<gentext key="legalnotice" text="правова примітка"/>
+<gentext key="Level" text="Рівень"/>
+<gentext key="level" text="рівень"/>
+<gentext key="MsgAud" text="Аудиторія"/>
+<gentext key="msgaud" text="аудиторія"/>
+<gentext key="MsgLevel" text="Рівень"/>
+<gentext key="msglevel" text="рівень"/>
+<gentext key="MsgOrig" text="Джерело"/>
+<gentext key="msgorig" text="джерело"/>
+<gentext key="Name" text="Ім';я"/>
+<gentext key="name" text="ім';я"/>
+<gentext key="NOTE" text="ПРИМІТКА"/>
+<gentext key="Note" text="Примітка"/>
+<gentext key="note" text="примітка"/>
+<gentext key="Origin" text="Джерело"/>
+<gentext key="origin" text="джерело"/>
+<gentext key="Part" text="Частина"/>
+<gentext key="part" text="частина"/>
+<gentext key="Part.abr" text="Ч."/>
+<gentext key="part.abr" text="Ч."/>
+<gentext key="Preface" text="Передмова"/>
+<gentext key="preface" text="передмова"/>
+<gentext key="Procedure" text="Процедура"/>
+<gentext key="procedure" text="Процедура"/>
+<gentext key="Procedure.abr" text="Проц."/>
+<gentext key="procedure.abr" text="Проц."/>
 <gentext key="ProductionSet" text="Production"/> <!-- en -->
-<gentext key="Published" text="&Ocy;&pcy;&ucy;&bcy;&lcy;&iukcy;&kcy;&ocy;&vcy;&acy;&ncy;&ocy;"/>
-<gentext key="published" text="&ocy;&pcy;&ucy;&bcy;&lcy;&iukcy;&kcy;&ocy;&vcy;&acy;&ncy;&ocy;"/>
-<gentext key="Qandadiv" text="&Pcy; &icy; &Vcy;"/>
-<gentext key="qandadiv" text="&Pcy; &icy; &Vcy;"/>
-<gentext key="Question" text="&Pcy;"/>
-<gentext key="question" text="&pcy;"/>
+<gentext key="Published" text="Опубліковано"/>
+<gentext key="published" text="опубліковано"/>
+<gentext key="Qandadiv" text="П и В"/>
+<gentext key="qandadiv" text="П и В"/>
+<gentext key="Question" text="П"/>
+<gentext key="question" text="п"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="Reference" text="&Pcy;&ocy;&scy;&icy;&lcy;&acy;&ncy;&ncy;&yacy;"/>
-<gentext key="reference" text="&pcy;&ocy;&scy;&icy;&lcy;&acy;&ncy;&ncy;&yacy;"/>
+<gentext key="Reference" text="Посилання"/>
+<gentext key="reference" text="посилання"/>
 <gentext key="RefName" text="Name"/>
 <gentext key="refname" text="Name"/> <!-- en -->
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
-<gentext key="RefSynopsisDiv" text="&Kcy;&ocy;&rcy;&ocy;&tcy;&kcy;&icy;&jcy; &ocy;&gcy;&lcy;&yacy;&dcy;"/>
-<gentext key="refsynopsisdiv" text="&kcy;&ocy;&rcy;&ocy;&tcy;&kcy;&icy;&jcy; &ocy;&gcy;&lcy;&yacy;&dcy;"/>
-<gentext key="RevHistory" text="&Ocy;&pcy;&icy;&scy; zcy;&mcy;&iukcy;&ncy;"/>
-<gentext key="revhistory" text="&ocy;&pcy;&icy;&scy; zcy;&mcy;&iukcy;&ncy;"/>
-<gentext key="Revision" text="&Pcy;&iecy;&rcy;&iecy;&gcy;&lcy;&yacy;&dcy;"/>
-<gentext key="revision" text="&pcy;&iecy;&rcy;&iecy;&gcy;&lcy;&yacy;&dcy;"/>
+<gentext key="RefSynopsisDiv" text="Короткий огляд"/>
+<gentext key="refsynopsisdiv" text="короткий огляд"/>
+<gentext key="RevHistory" text="Опис zcy;мін"/>
+<gentext key="revhistory" text="опис zcy;мін"/>
+<gentext key="Revision" text="Перегляд"/>
+<gentext key="revision" text="перегляд"/>
 <gentext key="sect1" text="Section"/> <!-- en -->
 <gentext key="sect2" text="Section"/> <!-- en -->
 <gentext key="sect3" text="Section"/> <!-- en -->
 <gentext key="sect4" text="Section"/> <!-- en -->
 <gentext key="sect5" text="Section"/> <!-- en -->
-<gentext key="Section" text="&Pcy;&acy;&rcy;&acy;&gcy;&rcy;&acy;&fcy;"/>
-<gentext key="section" text="&pcy;&acy;&rcy;&acy;&gcy;&rcy;&acy;&fcy;"/>
-<gentext key="Section.abr" text="&Pcy;&acy;&rcy;."/>
-<gentext key="section.abr" text="&pcy;&acy;&rcy;."/>
-<gentext key="See" text="&Dcy;&icy;&vcy;."/>
-<gentext key="see" text="&dcy;&icy;&vcy;."/>
-<gentext key="SeeAlso" text="&Dcy;&icy;&vcy;. tcy;&acy;&kcy;&ocy;&zhcy;"/>
-<gentext key="Seealso" text="&Dcy;&icy;&vcy;. tcy;&acy;&kcy;&ocy;&zhcy;"/>
-<gentext key="seealso" text="&scy;&icy;&vcy;. tcy;&acy;&kcy;&ocy;&zhcy;"/>
-<gentext key="Set" text="&Vcy;&icy;&bcy;&iukcy;&rcy;&kcy;&acy;"/>
-<gentext key="set" text="&vcy;&icy;&bcy;&iukcy;&rcy;&kcy;&acy;"/>
-<gentext key="SetIndex" text="&Icy;&ncy;&dcy;&iecy;&kcy;&scy; &vcy;&icy;&bcy;&iukcy;&rcy;&kcy;&icy;"/>
-<gentext key="setindex" text="&icy;&ncy;&dcy;&iecy;&kcy;&scy; &vcy;&icy;&bcy;&iukcy;&rcy;&kcy;&icy;"/>
-<gentext key="Sidebar" text="&Vcy;&ycy;&dcy;&iukcy;&lcy;&iecy;&ncy;&ncy;&yacy;"/>
-<gentext key="sidebar" text="&vcy;&ycy;&dcy;&iukcy;&lcy;&iecy;&ncy;&ncy;&yacy;"/>
-<gentext key="Step" text="&Kcy;&rcy;&ocy;&kcy;"/>
-<gentext key="step" text="&kcy;&rcy;&ocy;&kcy;"/>
-<gentext key="Table" text="&Tcy;&acy;&bcy;&lcy;&icy;&tscy;&yacy;"/>
-<gentext key="table" text="&tcy;&acy;&bcy;&lcy;&icy;&tscy;&yacy;"/>
-<gentext key="Table.abr" text="&Tcy;&acy;&bcy;&lcy;."/>
-<gentext key="table.abr" text="&tcy;&acy;&bcy;&lcy;."/>
-<gentext key="TIP" text="&Pcy;&Iukcy;&Dcy;&Kcy;&Acy;&Zcy;&Kcy;&Acy;"/>
-<gentext key="Tip" text="&Pcy;&iukcy;&dcy;&kcy;&acy;&zcy;&kcy;&acy;"/>
-<gentext key="tip" text="&pcy;&iukcy;&dcy;&kcy;&acy;&zcy;&kcy;&acy;"/>
-<gentext key="WARNING" text="&Zcy;&Acy;&Scy;&Tcy;&IEcy;&Rcy;&IEcy;&ZHcy;&IEcy;&Ncy;&Ncy;&YAcy;"/>
-<gentext key="Warning" text="&Zcy;&acy;&scy;&tcy;&iecy;&rcy;&iecy;&zhcy;&iecy;&ncy;&ncy;&yacy;"/>
-<gentext key="warning" text="&zcy;&acy;&scy;&tcy;&iecy;&rcy;&iecy;&zhcy;&iecy;&ncy;&ncy;&yacy;"/>
+<gentext key="Section" text="Параграф"/>
+<gentext key="section" text="параграф"/>
+<gentext key="Section.abr" text="Пар."/>
+<gentext key="section.abr" text="пар."/>
+<gentext key="See" text="Див."/>
+<gentext key="see" text="див."/>
+<gentext key="SeeAlso" text="Див. tcy;акож"/>
+<gentext key="Seealso" text="Див. tcy;акож"/>
+<gentext key="seealso" text="сив. tcy;акож"/>
+<gentext key="Set" text="Вибірка"/>
+<gentext key="set" text="вибірка"/>
+<gentext key="SetIndex" text="Индекс вибірки"/>
+<gentext key="setindex" text="индекс вибірки"/>
+<gentext key="Sidebar" text="Выділення"/>
+<gentext key="sidebar" text="выділення"/>
+<gentext key="Step" text="Крок"/>
+<gentext key="step" text="крок"/>
+<gentext key="Table" text="Таблиця"/>
+<gentext key="table" text="таблиця"/>
+<gentext key="Table.abr" text="Табл."/>
+<gentext key="table.abr" text="табл."/>
+<gentext key="TIP" text="ПІДКАЗКА"/>
+<gentext key="Tip" text="Підказка"/>
+<gentext key="tip" text="підказка"/>
+<gentext key="WARNING" text="ЗАСТЕРЕЖЕННЯ"/>
+<gentext key="Warning" text="Застереження"/>
+<gentext key="warning" text="застереження"/>
 
 <gentext key="and" text=""/> 
 <gentext key="by" text=""/>
 <gentext key="called" text=""/>
-<gentext key="edited" text="&pcy;&icy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&iukcy;&jukcy;&yucy;"/>
-<gentext key="Edited" text="&Pcy;&icy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&iukcy;&jukcy;&yucy;"/>
-<gentext key="Editedby" text="&Pcy;&icy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&iukcy;&jukcy;&yucy;"/>
-<gentext key="editedby" text="&pcy;&icy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&iukcy;&jukcy;&yucy;"/>
-<gentext key="in" text="&vcy;"/>
-<gentext key="TableofContents" text="&Zcy;&mcy;&iukcy;&scy;&tcy;"/>
-<gentext key="tableofcontents" text="&zcy;&mcy;&iukcy;&scy;&tcy;"/>
+<gentext key="edited" text="пид редакцією"/>
+<gentext key="Edited" text="Пид редакцією"/>
+<gentext key="Editedby" text="Пид редакцією"/>
+<gentext key="editedby" text="пид редакцією"/>
+<gentext key="in" text="в"/>
+<gentext key="TableofContents" text="Зміст"/>
+<gentext key="tableofcontents" text="зміст"/>
 <gentext key="lastlistcomma" text="."/>
 <gentext key="listcomma" text=","/>
-<gentext key="Notes" text="&Pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&icy;"/>
-<gentext key="notes" text="&pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&icy;"/>
-<gentext key="TableNotes" text="&Pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&icy;"/>
-<gentext key="tablenotes" text="&pcy;&rcy;&icy;&mcy;&iukcy;&tcy;&kcy;&icy;"/>
+<gentext key="Notes" text="Примітки"/>
+<gentext key="notes" text="примітки"/>
+<gentext key="TableNotes" text="Примітки"/>
+<gentext key="tablenotes" text="примітки"/>
 <gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="pgs" text="&scy;&tcy;&ocy;&rcy;."/>
-<gentext key="Pgs" text="&Scy;&tcy;&ocy;&rcy;."/>
-<gentext key="Revisedby" text="&Kcy;&ocy;&rcy;&iecy;&kcy;&tcy;&ucy;&rcy;&acy;:;"/>
-<gentext key="revisedby" text="&kcy;&ocy;&rcy;&iecy;&kcy;&tcy;&ucy;&rcy;&acy;:;"/>
+<gentext key="pgs" text="стор."/>
+<gentext key="Pgs" text="Стор."/>
+<gentext key="Revisedby" text="Коректура:;"/>
+<gentext key="revisedby" text="коректура:;"/>
 <gentext key="the" text=""/>
 <gentext key="unexpectedelementname" text="unexpected element name"/>
 <gentext key="unsupported" text="unsupported"/>
 <gentext key="xrefto" text="xref to"/>
 
-<gentext key="listofequations" text="&scy;&pcy;&icy;&scy;&ocy;&kcy; &fcy;&ocy;&rcy;&mcy;&ucy;&lcy;"/>
-<gentext key="ListofEquations" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &fcy;&ocy;&rcy;&mcy;&ucy;&lcy;"/>
-<gentext key="ListofExamples" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&rcy;&icy;&kcy;&lcy;&acy;&dcy;&iukcy;&vcy;"/>
-<gentext key="listofexamples" text="&scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&rcy;&icy;&kcy;&lcy;&acy;&dcy;&iukcy;&vcy;"/>
-<gentext key="ListofFigures" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &iukcy;&lcy;&yucy;&scy;&tcy;&rcy;&acy;&tscy;&iukcy;&jcy;"/>
-<gentext key="listoffigures" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &iukcy;&lcy;&yucy;&scy;&tcy;&rcy;&acy;&tscy;&iukcy;&jcy;"/>
-<gentext key="listoftables" text="&scy;&pcy;&icy;&scy;&ocy;&kcy; &tcy;&acy;&bcy;&lcy;&icy;&tscy;&softcy;"/>
-<gentext key="ListofTables" text="&Scy;&pcy;&icy;&scy;&ocy;&kcy; &tcy;&acy;&bcy;&lcy;&icy;&tscy;;&softcy;"/>
-<gentext key="ListofUnknown" text="&Ncy;&iecy;&vcy;&icy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy;"/>
-<gentext key="listofunknown" text="&ncy;&iecy;&vcy;&icy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy;"/>
-<gentext key="nav-next" text="&dcy;&acy;&lcy;&iukcy;"/>
-<gentext key="nav-next-sibling" text="&dcy;&acy;&lcy;&iukcy; &pcy;&ocy; &rcy;&iukcy;&vcy;&ncy;&yucy;"/>
-<gentext key="nav-prev" text="&ncy;&acy;&zcy;&acy;&dcy;"/>
-<gentext key="nav-prev-sibling" text="&ncy;&acy;&zcy;&acy;&dcy; &pcy;&ocy; &rcy;&iukcy;&vcy;&ncy;&yucy;"/>
-<gentext key="x-nav-next" text="&dcy;&acy;&lcy;&iukcy;"/>
-<gentext key="nav-home" text="&Pcy;&ocy;&chcy;&acy;&tcy;&ocy;&kcy;"/>
-<gentext key="nav-up" text="&Dcy;&ocy;&gcy;&ocy;&rcy;&icy;"/>
+<gentext key="listofequations" text="список формул"/>
+<gentext key="ListofEquations" text="Список формул"/>
+<gentext key="ListofExamples" text="Список прикладів"/>
+<gentext key="listofexamples" text="список прикладів"/>
+<gentext key="ListofFigures" text="Список ілюстрацій"/>
+<gentext key="listoffigures" text="Список ілюстрацій"/>
+<gentext key="listoftables" text="список таблиць"/>
+<gentext key="ListofTables" text="Список таблиц;ь"/>
+<gentext key="ListofUnknown" text="Невизначений список"/>
+<gentext key="listofunknown" text="невизначений список"/>
+<gentext key="nav-next" text="далі"/>
+<gentext key="nav-next-sibling" text="далі по рівню"/>
+<gentext key="nav-prev" text="назад"/>
+<gentext key="nav-prev-sibling" text="назад по рівню"/>
+<gentext key="x-nav-next" text="далі"/>
+<gentext key="nav-home" text="Початок"/>
+<gentext key="nav-up" text="Догори"/>
 
 <gentext key="sectioncalled" text="the section called"/> <!-- en -->
-<gentext key="Draft"         text="Draft"/> <!-- en -->
-<gentext key="above"         text="above"/> <!-- en -->
-<gentext key="below"         text="below"/> <!-- en -->
+<gentext key="Draft" text="Draft"/> <!-- en -->
+<gentext key="above" text="above"/> <!-- en -->
+<gentext key="below" text="below"/> <!-- en -->
 <gentext key="index symbols" text="Symbols"/> <!-- en -->
 
 <gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/> <!--en-->
 <gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/> <!--en-->
 
-<dingbat key="startquote" text="&#x201C;"/>
-<dingbat key="endquote" text="&#x201D;"/>
-<dingbat key="nestedstartquote" text="&#x2018;"/>
-<dingbat key="nestedendquote" text="&#x2019;"/>
-<dingbat key="bullet" text="&#x2022;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">
 
diff --git a/gentext/locale/zh_tw.xml b/gentext/locale/zh_tw.xml
index e0531a95f..682d7e6c9 100644
--- a/gentext/locale/zh_tw.xml
+++ b/gentext/locale/zh_tw.xml
@@ -177,11 +177,11 @@
 <gentext key="below"         text="below"/> <!-- en -->
 <gentext key="index symbols" text="Symbols"/> <!-- en -->
 
-<dingbat key="startquote"     text="&quot;"/>
-<dingbat key="endquote"       text="&quot;"/>
-<dingbat key="nestedstartquote" text="'"/>
-<dingbat key="nestedendquote"   text="'"/>
-<dingbat key="bullet"         text="&#x2022;"/>
+<dingbat key="startquote" text="“"/>
+<dingbat key="endquote" text="”"/>
+<dingbat key="nestedstartquote" text="‘"/>
+<dingbat key="nestedendquote" text="’"/>
+<dingbat key="bullet" text="•"/>
 
 <context name="styles">