From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 1 Aug 2001 11:36:27 +0000 (+0000)
Subject: Order doesn't matter, so I sorted all the gentext and template lines to reduce confus... 
X-Git-Tag: release/1.79.1~6^2~6334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=809cb9ddb25b648967c438d04ec0f65e10fa759d;p=docbook-dsssl

Order doesn't matter, so I sorted all the gentext and template lines to reduce confusion when editin g the files
---

diff --git a/gentext/locale/af.xml b/gentext/locale/af.xml
index af80fc908..c6b6bb55a 100644
--- a/gentext/locale/af.xml
+++ b/gentext/locale/af.xml
@@ -20,16 +20,18 @@
 <gentext key="Answer" text="Antwoord:"/>
 <gentext key="answer" text="Antwoord:"/>
 <gentext key="Appendix" text="Aanhangsel"/>
+<gentext key="appendix" text="aanhangsel"/>
 <gentext key="Article" text="Artikel"/>
 <gentext key="article" text="Artikel"/>
 <gentext key="Bibliography" text="Bibliografie"/>
 <gentext key="bibliography" text="Bibliografie"/>
 <gentext key="Book" text="Boek"/>
 <gentext key="book" text="Boek"/>
-<gentext key="CAUTION" text="PAS OP"/>
 <gentext key="Caution" text="Pas op"/>
 <gentext key="caution" text="Pas op"/>
+<gentext key="CAUTION" text="PAS OP"/>
 <gentext key="Chapter" text="Hoofdstuk"/>
+<gentext key="chapter" text="hoofdstuk"/>
 <gentext key="Colophon" text="Kolofon"/>
 <gentext key="colophon" text="Kolofon"/>
 <gentext key="Copyright" text="Kopie reg"/>
@@ -44,19 +46,19 @@
 <gentext key="example" text="Voorbeeld"/>
 <gentext key="Figure" text="Figuur"/>
 <gentext key="figure" text="Figuur"/>
+<gentext key="Glossary" text="Woordlys"/>
+<gentext key="glossary" text="Woordlys"/>
 <gentext key="GlossSee" text="Sien"/>
 <gentext key="glosssee" text="Sien"/>
 <gentext key="GlossSeeAlso" text="Sien ook"/>
 <gentext key="glossseealso" text="Sien ook"/>
-<gentext key="Glossary" text="Woordlys"/>
-<gentext key="glossary" text="Woordlys"/>
 <gentext key="IMPORTANT" text="BELANGRIK"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Belangrik"/>
 <gentext key="important" text="Belangrik"/>
 <gentext key="Index" text="Indeks"/>
 <gentext key="index" text="Indeks"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Regskennisgewing"/>
 <gentext key="legalnotice" text="Regskennisgewing"/>
 <gentext key="MsgAud" text="Teikengroep"/>
@@ -65,9 +67,9 @@
 <gentext key="msglevel" text="Vlak"/>
 <gentext key="MsgOrig" text="Herkoms"/>
 <gentext key="msgorig" text="Herkoms"/>
+<gentext key="note" text="Opmerking"/>
 <gentext key="NOTE" text="OPMERKING"/>
 <gentext key="Note" text="Opmerking"/>
-<gentext key="note" text="Opmerking"/>
 <gentext key="Part" text="Deel"/>
 <gentext key="part" text="Deel"/>
 <gentext key="Preface" text="Voorwoord"/>
@@ -88,77 +90,75 @@
 <gentext key="refsection" text="Verwysingsparagraaf"/>
 <gentext key="RefSynopsisDiv" text="Verwysingsamevatting"/>
 <gentext key="refsynopsisdiv" text="Verwysingsamevatting"/>
-<gentext key="Revision" text="Hersiening"/>
-<gentext key="revision" text="Hersiening"/>
 <gentext key="RevHistory" text="Hersiening geskiedenis"/>
 <gentext key="revhistory" text="Hersiening geskiedenis"/>
+<gentext key="Revision" text="Hersiening"/>
+<gentext key="revision" text="Hersiening"/>
 <gentext key="Section" text="Paragraaf"/>
-<gentext key="See" text="Sien"/>
+<gentext key="section" text="paragraaf"/>
 <gentext key="see" text="Sien"/>
-<gentext key="SeeAlso" text="Sien ook"/>
+<gentext key="See" text="Sien"/>
+<gentext key="Seealso" text="Sien ook"/>
 <gentext key="seealso" text="Sien ook"/>
-<gentext key="Set" text="Versameling"/>
+<gentext key="SeeAlso" text="Sien ook"/>
 <gentext key="set" text="Versameling"/>
+<gentext key="Set" text="Versameling"/>
 <gentext key="SetIndex" text="Indeks"/>
 <gentext key="setindex" text="Indeks"/>
 <gentext key="Sidebar" text="Ekskursie"/>
+<gentext key="sidebar" text="ekskursie"/>
+<gentext key="step" text="stap"/>
 <gentext key="Step" text="Stap"/>
-<gentext key="TIP" text="LEIDRAAD"/>
-<gentext key="Table" text="Tabel"/>
 <gentext key="table" text="Tabel"/>
+<gentext key="Table" text="Tabel"/>
+<gentext key="TIP" text="LEIDRAAD"/>
 <gentext key="Tip" text="Leidraad"/>
 <gentext key="tip" text="Leidraad"/>
 <gentext key="WARNING" text="WAARSKUWING"/>
 <gentext key="Warning" text="Waarskuwing"/>
 <gentext key="warning" text="Waarskuwing"/>
-<gentext key="appendix" text="aanhangsel"/>
-<gentext key="chapter" text="hoofdstuk"/>
-<gentext key="section" text="paragraaf"/>
-<gentext key="sidebar" text="ekskursie"/>
-<gentext key="step" text="stap"/>
-<gentext key="Seealso" text="Sien ook"/>
 
-<gentext key="TableofContents" text="Inhoudsopgawe"/>
-<gentext key="tableofcontents" text="Inhoudsopgawe"/>
-<gentext key="in" text="in"/>
+<gentext key="and" text="en"/>
 <gentext key="by" text="deur"/>
 <gentext key="Edited" text="Geredigeer"/>
 <gentext key="edited" text="Geredigeer"/>
 <gentext key="Editedby" text="Geredigeer deur"/>
 <gentext key="editedby" text="Geredigeer deur"/>
-<gentext key="and" text="en"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="in"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notas"/>
-<gentext key="notes" text="Notas"/>
-<gentext key="TableNotes" text="Opmerking"/>
-<gentext key="tablenotes" text="Opmerking"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="element bestaan nie"/>
+<gentext key="notes" text="Notas"/>
+<gentext key="Notes" text="Notas"/>
 <gentext key="Pgs" text="bl."/>
 <gentext key="pgs" text="bl."/>
-<gentext key="unsupported" text="nie geondersteun"/>
-<gentext key="xrefto" text="verwysing na"/>
-<gentext key="unexpectedelementname" text="ONVERWAGTE ELEMENT"/>
 <gentext key="Revisedby" text="Hersien deur: "/>
 <gentext key="revisedby" text="Hersien deur: "/>
+<gentext key="TableNotes" text="Opmerking"/>
+<gentext key="tablenotes" text="Opmerking"/>
+<gentext key="TableofContents" text="Inhoudsopgawe"/>
+<gentext key="tableofcontents" text="Inhoudsopgawe"/>
+<gentext key="unexpectedelementname" text="ONVERWAGTE ELEMENT"/>
+<gentext key="unsupported" text="nie geondersteun"/>
+<gentext key="xrefto" text="verwysing na"/>
 
-<gentext key="ListofTables" text="Lys van tabelle"/>
-<gentext key="listoftables" text="Lys van tabelle"/>
+<gentext key="listofequations" text="Lys van vergelykings"/>
+<gentext key="ListofEquations" text="Lys van vergelykings"/>
 <gentext key="ListofExamples" text="Lys van voorbeelde"/>
 <gentext key="listofexamples" text="Lys van voorbeelde"/>
 <gentext key="ListofFigures" text="Lys van figure"/>
 <gentext key="listoffigures" text="Lys van figure"/>
-<gentext key="ListofEquations" text="Lys van vergelykings"/>
-<gentext key="listofequations" text="Lys van vergelykings"/>
+<gentext key="listoftables" text="Lys van tabelle"/>
+<gentext key="ListofTables" text="Lys van tabelle"/>
 <gentext key="ListofUnknown" text="Lys van onbekende tipes"/>
 <gentext key="listofunknown" text="Lys van onbekende tipes"/>
 
+<gentext key="nav-home" text="Begin"/>
+<gentext key="nav-next" text="Volgende"/>
+<gentext key="nav-next-sibling" text="Verder vooruit"/>
 <gentext key="nav-prev" text="Terug"/>
 <gentext key="nav-prev-sibling" text="Verder terug"/>
-<gentext key="nav-next-sibling" text="Verder vooruit"/>
-<gentext key="nav-next" text="Volgende"/>
 <gentext key="nav-up" text="Boontoe"/>
-<gentext key="nav-home" text="Begin"/>
 
 <gentext key="sectioncalled"       text="die seksie genaamd"/>
 
@@ -358,9 +358,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/ca.xml b/gentext/locale/ca.xml
index 9d1a4f04c..a5b67058b 100644
--- a/gentext/locale/ca.xml
+++ b/gentext/locale/ca.xml
@@ -23,6 +23,7 @@
 <gentext key="abstract" text="Resum"/>
 <gentext key="Answer" text="Answer"/>
 <gentext key="answer" text="Answer"/> <!-- en -->
+<gentext key="appendix" text="ap&egrave;ndex"/>
 <gentext key="Appendix" text="Ap&egrave;ndix"/>
 <gentext key="Article" text="Article"/>
 <gentext key="article" text="Article"/>
@@ -30,10 +31,11 @@
 <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="CAUTION" text="ATENCI&Oacute;"/>
 <gentext key="Chapter" text="Cap&iacute;tol"/>
+<gentext key="chapter" text="cap&iacute;tol"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Dret de reproducci&oacute;"/>
@@ -48,19 +50,19 @@
 <gentext key="example" text="Exemple"/>
 <gentext key="Figure" text="Figura"/>
 <gentext key="figure" text="Figura"/>
+<gentext key="Glossary" text="Glossari"/>
+<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="Glossary" text="Glossari"/>
-<gentext key="glossary" text="Glossari"/>
 <gentext key="IMPORTANT" text="IMPORTANT"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <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="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text=""/>
 <gentext key="legalnotice" text=""/> <!-- "Not&iacute;cia legal"-->
 <gentext key="MsgAud" text="Audi&egrave;ncia"/>
@@ -69,9 +71,9 @@
 <gentext key="msglevel" text="Nivell"/>
 <gentext key="MsgOrig" text="Origen"/>
 <gentext key="msgorig" text="Origen"/>
+<gentext key="note" text="Nota"/>
 <gentext key="NOTE" text="NOTA"/>
 <gentext key="Note" text="Nota"/>
-<gentext key="note" text="Nota"/>
 <gentext key="Part" text="Part"/>
 <gentext key="part" text="Part"/>
 <gentext key="Preface" text="Prefaci"/>
@@ -94,77 +96,75 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="Revision" text="Revisi&oacute;"/>
-<gentext key="revision" text="Revisi&oacute;"/>
 <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="Section" text="Secci&oacute;"/>
-<gentext key="See" text="Veure"/>
+<gentext key="section" text="secci&oacute;"/>
 <gentext key="see" text="Veure"/>
-<gentext key="SeeAlso" text="Veure tambi&eacute;"/>
+<gentext key="See" text="Veure"/>
+<gentext key="Seealso" text="Veure tamb&eacute;"/>
 <gentext key="seealso" text="Veure tambi&eacute;"/>
+<gentext key="SeeAlso" text="Veure tambi&eacute;"/>
 <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="Sidebar" text=""/> <!-- Hauria de ser: glossa, pero deixat buit per consistencia-->
+<gentext key="sidebar" text="glossa"/>
+<gentext key="step" text="pas"/>
 <gentext key="Step" text="Pas"/>
-<gentext key="TIP" text="SUGGERIMENT"/>
-<gentext key="Table" text="Taula"/>
 <gentext key="table" text="Taula"/>
+<gentext key="Table" text="Taula"/>
+<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="appendix" text="ap&egrave;ndex"/>
-<gentext key="chapter" text="cap&iacute;tol"/>
-<gentext key="section" text="secci&oacute;"/>
-<gentext key="sidebar" text="glossa"/>
-<gentext key="step" text="pas"/>
-<gentext key="Seealso" text="Veure tamb&eacute;"/>
 
-<gentext key="TableofContents" text="Sumari"/>
-<gentext key="tableofcontents" text="Sumari"/>
-<gentext key="in" text="a"/>
+<gentext key="and" text="i"/>
 <gentext key="by" text="per"/>
 <gentext key="Edited" text="Editat"/>
 <gentext key="edited" text="Editat"/>
 <gentext key="Editedby" text="Editat per"/>
 <gentext key="editedby" text="Editat per"/>
-<gentext key="and" text="i"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="a"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notes"/>
-<gentext key="notes" text="Notes"/>
-<gentext key="TableNotes" text="Notes"/>
-<gentext key="tablenotes" text="Notes"/>
+<gentext key="listcomma" text=","/>
 <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="unsupported" text="no reconeguda"/>
-<gentext key="xrefto" text="xref a"/>
-<gentext key="unexpectedelementname" text="Nom d'element no esperat"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="Notes"/>
+<gentext key="tablenotes" text="Notes"/>
+<gentext key="TableofContents" text="Sumari"/>
+<gentext key="tableofcontents" text="Sumari"/>
+<gentext key="unexpectedelementname" text="Nom d'element no esperat"/>
+<gentext key="unsupported" text="no reconeguda"/>
+<gentext key="xrefto" text="xref a"/>
 
-<gentext key="ListofTables" text="&Iacute;ndex de taules"/>
-<gentext key="listoftables" text="&Iacute;ndex de taules"/>
+<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="ListofEquations" text="&Iacute;ndex d'equacions"/>
-<gentext key="listofequations" text="&Iacute;ndex d'equacions"/>
+<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="nav-home" text="Inici"/>
+<gentext key="nav-next" text="Seguent"/>
+<gentext key="nav-next-sibling" text="Avancar"/>
 <gentext key="nav-prev" text="Anterior"/>
 <gentext key="nav-prev-sibling" text="Retrocedir"/>
-<gentext key="nav-next-sibling" text="Avancar"/>
-<gentext key="nav-next" text="Seguent"/>
 <gentext key="nav-up" text="Pujar"/>
-<gentext key="nav-home" text="Inici"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -360,9 +360,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/cs.xml b/gentext/locale/cs.xml
index cf5d99774..c6792b3fa 100644
--- a/gentext/locale/cs.xml
+++ b/gentext/locale/cs.xml
@@ -121,47 +121,47 @@
 <gentext key="Warning" text="Varov&#x00E1;n&#x00ED;"/>
 <gentext key="warning" text="Varov&#x00E1;n&#x00ED;"/>
 
-<gentext key="TableofContents" text="Obsah"/>
-<gentext key="tableofcontents" text="Obsah"/>
-<gentext key="in" text="v"/>
+<gentext key="and" text="a"/>
 <gentext key="by" text=""/>
 <gentext key="Edited" text="Vyd&#x00E1;no"/>
 <gentext key="edited" text="Vyd&#x00E1;no"/>
 <gentext key="Editedby" text="Sestavil"/>
 <gentext key="editedby" text="Sestavil"/>
-<gentext key="and" text="a"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="v"/>
 <gentext key="lastlistcomma" text=""/>
-<gentext key="Notes" text="Pozn&#x00E1;mky"/>
-<gentext key="notes" text="Pozn&#x00E1;mky"/>
-<gentext key="TableNotes" text="Pozn&#x00E1;mky"/>
-<gentext key="tablenotes" text="Pozn&#x00E1;mky"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="neexistuj&#x00ED;c&#x00ED; prvek"/>
+<gentext key="notes" text="Pozn&#x00E1;mky"/>
+<gentext key="Notes" text="Pozn&#x00E1;mky"/>
 <gentext key="Pgs" text="Str."/>
 <gentext key="pgs" text="Str."/>
-<gentext key="unsupported" text="nepodporovan&#x00FD;"/>
-<gentext key="xrefto" text="xref k"/>
-<gentext key="unexpectedelementname" text="Neo&#x010D;ek&#x00E1;van&#x00E9; jm&#x00E9;no prvku"/>
 <gentext key="Revisedby" text="Revidoval: "/>
 <gentext key="revisedby" text="Revidoval: "/> 
+<gentext key="TableNotes" text="Pozn&#x00E1;mky"/>
+<gentext key="tablenotes" text="Pozn&#x00E1;mky"/>
+<gentext key="TableofContents" text="Obsah"/>
+<gentext key="tableofcontents" text="Obsah"/>
+<gentext key="unexpectedelementname" text="Neo&#x010D;ek&#x00E1;van&#x00E9; jm&#x00E9;no prvku"/>
+<gentext key="unsupported" text="nepodporovan&#x00FD;"/>
+<gentext key="xrefto" text="xref k"/>
 
-<gentext key="ListofTables" text="Seznam tabulek"/>
-<gentext key="listoftables" text="Seznam tabulek"/>
+<gentext key="listofequations" text="Seznam rovnic"/>
+<gentext key="ListofEquations" text="Seznam rovnic"/>
 <gentext key="ListofExamples" text="Seznam p&#x0159;&#x00ED;klad&#x016F;"/>
 <gentext key="listofexamples" text="Seznam p&#x0159;&#x00ED;klad&#x016F;"/>
 <gentext key="ListofFigures" text="Seznam obr&#x00E1;zk&#x016F;"/>
 <gentext key="listoffigures" text="Seznam obr&#x00E1;zk&#x016F;"/>
-<gentext key="ListofEquations" text="Seznam rovnic"/>
-<gentext key="listofequations" text="Seznam rovnic"/>
+<gentext key="listoftables" text="Seznam tabulek"/>
+<gentext key="ListofTables" text="Seznam tabulek"/>
 <gentext key="ListofUnknown" text="Seznam nezn&#x00E1;m&#x00E9;ho"/>
 <gentext key="listofunknown" text="Seznam nezn&#x00E1;m&#x00E9;ho"/>
 
+<gentext key="nav-home" text="Dom&#x016F;"/>
+<gentext key="nav-next" text="Dal&#x0161;&#x00ED;"/>
+<gentext key="nav-next-sibling" text="Rychle dop&#x0159;edu"/>
 <gentext key="nav-prev" text="P&#x0159;edch&#x00E1;zej&#x00ED;c&#x00ED;"/>
 <gentext key="nav-prev-sibling" text="Rychle zp&#x011B;t"/>
-<gentext key="nav-next-sibling" text="Rychle dop&#x0159;edu"/>
-<gentext key="nav-next" text="Dal&#x0161;&#x00ED;"/>
 <gentext key="nav-up" text="Nahoru"/>
-<gentext key="nav-home" text="Dom&#x016F;"/>
 
 <gentext key="sectioncalled"  text="odd&#x00ed;l nazvan&#x00fd;"/>
 
@@ -359,9 +359,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/da.xml b/gentext/locale/da.xml
index b51470958..eea4657f8 100644
--- a/gentext/locale/da.xml
+++ b/gentext/locale/da.xml
@@ -19,6 +19,7 @@
 <gentext key="Answer" text="Svar"/>
 <gentext key="answer" text="Svar"/>
 <gentext key="Appendix" text="Appendiks"/>
+<gentext key="appendix" text="appendiks"/>
 <gentext key="Article" text="Artikel"/>
 <gentext key="article" text="Artikel"/>
 <gentext key="Bibliography" text="Bibliografi"/>
@@ -26,9 +27,10 @@
 <gentext key="Book" text="Bog"/>
 <gentext key="book" text="Bog"/>
 <gentext key="CAUTION" text="BEM&#198;RK"/>
-<gentext key="Caution" text="Bem&#230;rk"/>
 <gentext key="caution" text="Bem&#230;rk"/>
+<gentext key="Caution" text="Bem&#230;rk"/>
 <gentext key="Chapter" text="Kapitel"/>
+<gentext key="chapter" text="kapitel"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/>
 <gentext key="Copyright" text="Copyright"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Eksempel"/>
 <gentext key="Figure" text="Figur"/>
 <gentext key="figure" text="Figur"/>
+<gentext key="Glossary" text="Stikordregister"/>
+<gentext key="glossary" text="Stikordregister"/>
 <gentext key="GlossSee" text="Se"/>
 <gentext key="glosssee" text="Se"/>
 <gentext key="GlossSeeAlso" text="Se ogs&#229;"/>
 <gentext key="glossseealso" text="Se ogs&#229;"/>
-<gentext key="Glossary" text="Stikordregister"/>
-<gentext key="glossary" text="Stikordregister"/>
 <gentext key="IMPORTANT" text="VIGTIGT"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Vigtigt"/>
 <gentext key="important" text="Vigtigt"/>
 <gentext key="Index" text="Index"/>
 <gentext key="index" text="Index"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Retslig note"/>
 <gentext key="legalnotice" text="Retslig note"/>
 <gentext key="MsgAud" text="M&#229;lgruppe"/>
@@ -64,9 +66,9 @@
 <gentext key="msglevel" text="Niveau"/>
 <gentext key="MsgOrig" text="Grundlag"/>
 <gentext key="msgorig" text="Grundlag"/>
+<gentext key="note" text="Note"/>
 <gentext key="NOTE" text="NOTE"/>
 <gentext key="Note" text="Note"/>
-<gentext key="note" text="Note"/>
 <gentext key="Part" text="Del"/>
 <gentext key="part" text="Del"/>
 <gentext key="Preface" text="Forord"/>
@@ -81,85 +83,83 @@
 <gentext key="question" text="Sp&#248;rgsm&#229;l"/>
 <gentext key="RefEntry" text="Enhed"/>
 <gentext key="refentry" text="Enhed"/>
-<gentext key="RefName" text="Navn"/>
-<gentext key="refname" text="Navn"/>
 <gentext key="Reference" text="Reference"/>
 <gentext key="reference" text="Reference"/>
-<gentext key="Revision" text="Revision"/>
-<gentext key="revision" text="Revision"/>
-<gentext key="RevHistory" text="Revision historie"/>
-<gentext key="revhistory" text="Revision historie"/>
+<gentext key="RefName" text="Navn"/>
+<gentext key="refname" text="Navn"/>
 <gentext key="RefSection" text="Sektion"/>
 <gentext key="refsection" text="Sektion"/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/>
+<gentext key="RevHistory" text="Revision historie"/>
+<gentext key="revhistory" text="Revision historie"/>
+<gentext key="Revision" text="Revision"/>
+<gentext key="revision" text="Revision"/>
 <gentext key="Section" text="Afsnit"/>
-<gentext key="See" text="Se"/>
+<gentext key="section" text="afsnit"/>
 <gentext key="see" text="Se"/>
-<gentext key="SeeAlso" text="Se ogs&#229;"/>
+<gentext key="See" text="Se"/>
 <gentext key="seealso" text="Se ogs&#229;"/>
+<gentext key="SeeAlso" text="Se ogs&#229;"/>
+<gentext key="Seealso" text="Se ogs&#229;"/>
 <gentext key="Set" text="S&#230;t"/>
 <gentext key="set" text="S&#230;t"/>
 <gentext key="SetIndex" text="S&#230;t indeks"/>
 <gentext key="setindex" text="S&#230;t indeks"/>
+<gentext key="sidebar" text="side bar"/>
 <gentext key="Sidebar" text="Side bar"/>
+<gentext key="step" text="skridt"/>
 <gentext key="Step" text="Skridt"/>
-<gentext key="TIP" text="TIP"/>
-<gentext key="Table" text="Tabel"/>
 <gentext key="table" text="Tabel"/>
+<gentext key="Table" text="Tabel"/>
+<gentext key="TIP" text="TIP"/>
 <gentext key="Tip" text="Tip"/>
 <gentext key="tip" text="Tip"/>
 <gentext key="WARNING" text="ADVARSEL"/>
 <gentext key="Warning" text="Advarsel"/>
 <gentext key="warning" text="Advarsel"/>
-<gentext key="appendix" text="appendiks"/>
-<gentext key="chapter" text="kapitel"/>
-<gentext key="section" text="afsnit"/>
-<gentext key="sidebar" text="side bar"/>
-<gentext key="step" text="skridt"/>
-<gentext key="Seealso" text="Se ogs&#229;"/>
 
-<gentext key="TableofContents" text="Indholdsfortegnelse"/>
-<gentext key="tableofcontents" text="Indholdsfortegnelse"/>
-<gentext key="in" text="i"/>
+<gentext key="and" text="og"/>
 <gentext key="by" text="af"/>
 <gentext key="Edited" text="Redigeret"/>
 <gentext key="edited" text="Redigeret"/>
 <gentext key="Editedby" text="Redigeret af"/>
 <gentext key="editedby" text="Redigeret af"/>
-<gentext key="and" text="og"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="i"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Slutbem&#230;rkning:"/>
-<gentext key="notes" text="Slutbem&#230;rkning:"/>
-<gentext key="TableNotes" text="Noter:"/>
-<gentext key="tablenotes" text="Noter:"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="ikke-eksisterende element"/>
+<gentext key="notes" text="Slutbem&#230;rkning:"/>
+<gentext key="Notes" text="Slutbem&#230;rkning:"/>
 <gentext key="Pgs" text="siderne"/>
 <gentext key="pgs" text="siderne"/>
-<gentext key="unsupported" text="ikke underst&#248;ttet"/>
-<gentext key="xrefto" text="xref til"/>
-<gentext key="unexpectedelementname" text="Uventet element navn"/>
 <gentext key="Revisedby" text="Revideret af: "/>
 <gentext key="revisedby" text="Revideret af: "/>
+<gentext key="TableNotes" text="Noter:"/>
+<gentext key="tablenotes" text="Noter:"/>
+<gentext key="TableofContents" text="Indholdsfortegnelse"/>
+<gentext key="tableofcontents" text="Indholdsfortegnelse"/>
+<gentext key="unexpectedelementname" text="Uventet element navn"/>
+<gentext key="unsupported" text="ikke underst&#248;ttet"/>
+<gentext key="xrefto" text="xref til"/>
 
-<gentext key="ListofTables" text="Liste over alle tabeller"/>
-<gentext key="listoftables" text="Liste over alle tabeller"/>
+<gentext key="listofequations" text="Liste over alle ligninger"/>
+<gentext key="ListofEquations" text="Liste over alle ligninger"/>
 <gentext key="ListofExamples" text="Liste over alle eksempler"/>
 <gentext key="listofexamples" text="Liste over alle eksempler"/>
 <gentext key="ListofFigures" text="Liste over alle figurer"/>
 <gentext key="listoffigures" text="Liste over alle figurer"/>
-<gentext key="ListofEquations" text="Liste over alle ligninger"/>
-<gentext key="listofequations" text="Liste over alle ligninger"/>
+<gentext key="listoftables" text="Liste over alle tabeller"/>
+<gentext key="ListofTables" text="Liste over alle tabeller"/>
 <gentext key="ListofUnknown" text="Liste over alle ????"/>
 <gentext key="listofunknown" text="Liste over alle ????"/>
 
+<gentext key="nav-home" text="Hjem"/>
+<gentext key="nav-next" text="N&#230;ste"/>
+<gentext key="nav-next-sibling" text="Hurtigt fremad"/>
 <gentext key="nav-prev" text="Forrige"/>
 <gentext key="nav-prev-sibling" text="Hurtigt tilbage"/>
-<gentext key="nav-next-sibling" text="Hurtigt fremad"/>
-<gentext key="nav-next" text="N&#230;ste"/>
 <gentext key="nav-up" text="Op"/>
-<gentext key="nav-home" text="Hjem"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -355,9 +355,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/de.xml b/gentext/locale/de.xml
index d44bc3f03..8f8aae435 100644
--- a/gentext/locale/de.xml
+++ b/gentext/locale/de.xml
@@ -29,16 +29,18 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/>
 <gentext key="Appendix" text="Anhang"/>
+<gentext key="appendix" text="Anhang"/>
 <gentext key="Article" text="Artikel"/>
 <gentext key="article" text="Artikel"/>
 <gentext key="Bibliography" text="Literaturverzeichnis"/>
 <gentext key="bibliography" text="Literaturverzeichnis"/>
 <gentext key="Book" text="Buch"/>
 <gentext key="book" text="Buch"/>
-<gentext key="CAUTION" text="ACHTUNG"/>
 <gentext key="Caution" text="Achtung"/>
 <gentext key="caution" text="Achtung"/>
+<gentext key="CAUTION" text="ACHTUNG"/>
 <gentext key="Chapter" text="Kapitel"/>
+<gentext key="chapter" text="Kapitel"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
@@ -53,19 +55,19 @@
 <gentext key="example" text="Beispiel"/>
 <gentext key="Figure" text="Abbildung"/>
 <gentext key="figure" text="Abbildung"/>
+<gentext key="Glossary" text="Glossar"/>
+<gentext key="glossary" text="Glossar"/>
 <gentext key="GlossSee" text="Siehe"/>
 <gentext key="glosssee" text="Siehe"/>
 <gentext key="GlossSeeAlso" text="Siehe auch"/>
 <gentext key="glossseealso" text="Siehe auch"/>
-<gentext key="Glossary" text="Glossar"/>
-<gentext key="glossary" text="Glossar"/>
 <gentext key="IMPORTANT" text="WICHTIG"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Wichtig"/>
 <gentext key="important" text="Wichtig"/>
 <gentext key="Index" text="Stichwortverzeichnis"/>
 <gentext key="index" text="Stichwortverzeichnis"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Rechtlicher Hinweis"/>
 <gentext key="legalnotice" text="Rechtlicher Hinweis"/>
 <gentext key="MsgAud" text="Zielgruppe"/>
@@ -74,11 +76,11 @@
 <gentext key="msglevel" text="Dringlichkeit"/>
 <gentext key="MsgOrig" text="Ursprung"/>
 <gentext key="msgorig" text="Ursprung"/>
+<gentext key="note" text="Anmerkung"/>
 <gentext key="NOTE" text="ANMERKUNG"/>
 <gentext key="Note" text="Anmerkung"/>
-<gentext key="note" text="Anmerkung"/>
-<gentext key="Part" text="Teil"/>
 <gentext key="part" text="Teil"/>
+<gentext key="Part" text="Teil"/>
 <gentext key="Preface" text="Vorwort"/>
 <gentext key="preface" text="Vorwort"/>
 <gentext key="Procedure" text="Prozedur"/>
@@ -87,12 +89,12 @@
 <gentext key="published" text="Ver&ouml;ffentlicht"/>
 <gentext key="Question" text="F:"/>
 <gentext key="question" text="F:"/>
-<gentext key="RefName" text="Name"/>
-<gentext key="refname" text="Name"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
 <gentext key="Reference" text="Verweis"/>
 <gentext key="reference" text="Verweis"/>
+<gentext key="refname" text="Name"/>
+<gentext key="RefName" text="Name"/>
 <gentext key="RefSection" text="Abschnitt"/>
 <gentext key="refsection" text="Abschnitt"/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
@@ -102,72 +104,70 @@
 <gentext key="Revision" text="Version"/>
 <gentext key="revision" text="Version"/>
 <gentext key="Section" text="Abschnitt"/>
-<gentext key="See" text="Siehe"/>
+<gentext key="section" text="Abschnitt"/>
 <gentext key="see" text="Siehe"/>
+<gentext key="See" text="Siehe"/>
 <gentext key="SeeAlso" text="Siehe auch"/>
 <gentext key="seealso" text="Siehe auch"/>
 <gentext key="Seealso" text="Siehe auch"/>
 <gentext key="Set" text="Satz"/>
 <gentext key="set" text="Satz"/>
-<gentext key="SetIndex" text="Stichwortverzeichnis"/>
 <gentext key="setindex" text="Stichwortverzeichnis"/>
-<gentext key="Sidebar" text="Randnotiz"/>
+<gentext key="SetIndex" text="Stichwortverzeichnis"/>
 <gentext key="sidebar" text="randnotiz"/>
+<gentext key="Sidebar" text="Randnotiz"/>
 <gentext key="Step" text="Schritt"/>
-<gentext key="TIP" text="TIPP"/>
-<gentext key="Table" text="Tabelle"/>
+<gentext key="step" text="Schritt"/>
 <gentext key="table" text="Tabelle"/>
+<gentext key="Table" text="Tabelle"/>
+<gentext key="TIP" text="TIPP"/>
 <gentext key="Tip" text="Tipp"/>
 <gentext key="tip" text="Tipp"/>
-<gentext key="WARNING" text="WARNUNG"/>
 <gentext key="Warning" text="Warnung"/>
 <gentext key="warning" text="Warnung"/>
-<gentext key="appendix" text="Anhang"/>
-<gentext key="chapter" text="Kapitel"/>
-<gentext key="section" text="Abschnitt"/>
-<gentext key="step" text="Schritt"/>
+<gentext key="WARNING" text="WARNUNG"/>
 
-<gentext key="TableofContents" text="Inhaltsverzeichnis"/>
-<gentext key="tableofcontents" text="Inhaltsverzeichnis"/>
-<gentext key="in" text="in"/>
+<gentext key="and" text="und"/>
 <gentext key="by" text="von"/>
 <gentext key="Edited" text="Herausgegeben"/>
 <gentext key="edited" text="Herausgegeben"/>
 <gentext key="Editedby" text="Herausgegeben von"/>
 <gentext key="editedby" text="Herausgegeben von"/>
-<gentext key="and" text="und"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="in"/>
 <gentext key="lastlistcomma" text=""/>
-<gentext key="Notes" text="Fu&#x00DF;noten"/>
-<gentext key="notes" text="Fu&#x00DF;noten"/>
-<gentext key="TableNotes" text="Bemerkungen"/>
-<gentext key="tablenotes" text="Bemerkungen"/>
+<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="Pgs" text="Seiten"/>
 <gentext key="pgs" text="Seiten"/>
-<gentext key="unsupported" text="wird nicht unterst&uuml;tzt"/>
-<gentext key="xrefto" text="xref auf"/>
-<gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
 <gentext key="Revisedby" text="Ge&auml;ndert durch: "/>
 <gentext key="revisedby" text="Ge&auml;ndert durch: "/>
+<gentext key="TableNotes" text="Bemerkungen"/>
+<gentext key="tablenotes" text="Bemerkungen"/>
+<gentext key="TableofContents" text="Inhaltsverzeichnis"/>
+<gentext key="tableofcontents" text="Inhaltsverzeichnis"/>
+<gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
+<gentext key="unsupported" text="wird nicht unterst&uuml;tzt"/>
+<gentext key="xrefto" text="xref auf"/>
 
-<gentext key="ListofTables" text="Tabellenverzeichnis"/>
-<gentext key="listoftables" text="Tabellenverzeichnis"/>
+<gentext key="listofequations" text="Gleichungen"/>
+<gentext key="ListofEquations" text="Gleichungen"/>
 <gentext key="ListofExamples" text="Beispiele"/>
 <gentext key="listofexamples" text="Beispiele"/>
 <gentext key="ListofFigures" text="Abbildungsverzeichnis"/>
 <gentext key="listoffigures" text="Abbildungsverzeichnis"/>
-<gentext key="ListofEquations" text="Gleichungen"/>
-<gentext key="listofequations" text="Gleichungen"/>
+<gentext key="listoftables" text="Tabellenverzeichnis"/>
+<gentext key="ListofTables" text="Tabellenverzeichnis"/>
 <gentext key="ListofUnknown" text="???-Verzeichnis"/>
 <gentext key="listofunknown" text="???-Verzeichnis"/>
 
+<gentext key="nav-home" text="Zum Anfang"/>
+<gentext key="nav-next" text="Nach vorne"/>
+<gentext key="nav-next-sibling" text="Schnell nach vorne"/>
 <gentext key="nav-prev" text="Zur&uuml;ck"/>
 <gentext key="nav-prev-sibling" text="Schnell zur&uuml;ck"/>
-<gentext key="nav-next-sibling" text="Schnell nach vorne"/>
-<gentext key="nav-next" text="Nach vorne"/>
 <gentext key="nav-up" text="Nach oben"/>
-<gentext key="nav-home" text="Zum Anfang"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -221,6 +221,7 @@
 <template name="procedure.formal"><Procedure/> %n. %t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaset">%t</template>
+<template name="question"><Question/> %n</template>
 <template name="reference">%t</template>
 <template name="refsect1">%t</template>
 <template name="refsect2">%t</template>
@@ -237,7 +238,6 @@
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
 <template name="warning">%t</template>
-<template name="question"><Question/> %n</template>
 </context>
 
 <context name="section-title">
@@ -364,9 +364,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/el.xml b/gentext/locale/el.xml
index e9922de56..a63aadc46 100644
--- a/gentext/locale/el.xml
+++ b/gentext/locale/el.xml
@@ -19,6 +19,7 @@
 <gentext key="Answer" text="&#193;:"/>
 <gentext key="answer" text="&#193;:"/>
 <gentext key="Appendix" text="&#208;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225;"/>
+<gentext key="appendix" text="&#240;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225;"/>
 <gentext key="Article" text="&#182;&#241;&#232;&#241;&#239;"/>
 <gentext key="article" text="&#182;&#241;&#232;&#241;&#239;"/>
 <gentext key="Bibliography" text="&#194;&#233;&#226;&#235;&#233;&#239;&#227;&#241;&#225;&#246;&#223;&#225;"/>
@@ -26,9 +27,10 @@
 <gentext key="Book" text="&#194;&#233;&#226;&#235;&#223;&#239;"/>
 <gentext key="book" text="&#194;&#233;&#226;&#235;&#223;&#239;"/>
 <gentext key="CAUTION" text="&#208;&#209;&#207;&#211;&#207;&#215;&#199;"/>
-<gentext key="Caution" text="&#208;&#241;&#239;&#243;&#239;&#247;&#222;"/>
 <gentext key="caution" text="&#208;&#241;&#239;&#243;&#239;&#247;&#222;"/>
+<gentext key="Caution" text="&#208;&#241;&#239;&#243;&#239;&#247;&#222;"/>
 <gentext key="Chapter" text="&#202;&#229;&#246;&#220;&#235;&#225;&#233;&#239;"/>
+<gentext key="chapter" text="&#234;&#229;&#246;&#220;&#235;&#225;&#233;&#239;"/>
 <gentext key="Colophon" text="&#202;&#239;&#241;&#249;&#237;&#223;&#228;&#225;"/>
 <gentext key="colophon" text="&#202;&#239;&#241;&#249;&#237;&#223;&#228;&#225;"/>
 <gentext key="Copyright" text="&#208;&#237;&#229;&#245;&#236;&#225;&#244;&#233;&#234;&#220; &#196;&#233;&#234;&#225;&#233;&#254;&#236;&#225;&#244;&#225;"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="&#208;&#225;&#241;&#220;&#228;&#229;&#233;&#227;&#236;&#225;"/>
 <gentext key="Figure" text="&#211;&#247;&#222;&#236;&#225;"/>
 <gentext key="figure" text="&#211;&#247;&#222;&#236;&#225;"/>
+<gentext key="Glossary" text="&#195;&#235;&#249;&#243;&#243;&#220;&#241;&#233;&#239;"/>
+<gentext key="glossary" text="&#195;&#235;&#249;&#243;&#243;&#220;&#241;&#233;&#239;"/>
 <gentext key="GlossSee" text="&#196;&#229;&#223;&#244;&#229;"/>
 <gentext key="glosssee" text="&#196;&#229;&#223;&#244;&#229;"/>
 <gentext key="GlossSeeAlso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
 <gentext key="glossseealso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
-<gentext key="Glossary" text="&#195;&#235;&#249;&#243;&#243;&#220;&#241;&#233;&#239;"/>
-<gentext key="glossary" text="&#195;&#235;&#249;&#243;&#243;&#220;&#241;&#233;&#239;"/>
 <gentext key="IMPORTANT" text="&#211;&#199;&#204;&#193;&#205;&#212;&#201;&#202;&#207;"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="&#211;&#231;&#236;&#225;&#237;&#244;&#233;&#234;&#252;"/>
 <gentext key="important" text="&#211;&#231;&#236;&#225;&#237;&#244;&#233;&#234;&#252;"/>
 <gentext key="Index" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239;"/>
 <gentext key="index" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239;"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="&#205;&#239;&#236;&#233;&#234;&#222; &#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
 <gentext key="legalnotice" text="&#205;&#239;&#236;&#233;&#234;&#222; &#211;&#231;&#236;&#229;&#223;&#249;&#243;&#231;"/>
 <gentext key="MsgAud" text="&#193;&#234;&#241;&#239;&#225;&#244;&#222;&#241;&#233;&#239;"/>
@@ -87,77 +89,75 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="&#211;&#253;&#237;&#239;&#248;&#231;"/>
 <gentext key="refsynopsisdiv" text="&#211;&#253;&#237;&#239;&#248;&#231;"/>
-<gentext key="Revision" text="&#193;&#237;&#225;&#232;&#229;&#254;&#241;&#231;&#243;&#231;"/>
-<gentext key="revision" text="&#193;&#237;&#225;&#232;&#229;&#254;&#241;&#231;&#243;&#231;"/>
 <gentext key="RevHistory" text="&#201;&#243;&#244;&#239;&#241;&#233;&#234;&#252; &#193;&#237;&#225;&#232;&#229;&#249;&#241;&#222;&#243;&#229;&#249;&#237;"/>
 <gentext key="revhistory" text="&#201;&#243;&#244;&#239;&#241;&#233;&#234;&#252; &#193;&#237;&#225;&#232;&#229;&#249;&#241;&#222;&#243;&#229;&#249;&#237;"/>
+<gentext key="Revision" text="&#193;&#237;&#225;&#232;&#229;&#254;&#241;&#231;&#243;&#231;"/>
+<gentext key="revision" text="&#193;&#237;&#225;&#232;&#229;&#254;&#241;&#231;&#243;&#231;"/>
 <gentext key="Section" text="&#212;&#236;&#222;&#236;&#225;"/>
+<gentext key="section" text="&#244;&#236;&#222;&#236;&#225;"/>
 <gentext key="See" text="&#196;&#229;&#223;&#244;&#229;"/>
 <gentext key="see" text="&#196;&#229;&#223;&#244;&#229;"/>
 <gentext key="SeeAlso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
 <gentext key="seealso" text="&#196;&#229;&#223;&#244;&#229; &#197;&#240;&#223;&#243;&#231;&#242;"/>
+<gentext key="Seealso" text="&#196;&#229;&#223;&#244;&#229; &#229;&#240;&#223;&#243;&#231;&#242;"/>
 <gentext key="Set" text="&#211;&#253;&#237;&#239;&#235;&#239;"/>
 <gentext key="set" text="&#211;&#253;&#237;&#239;&#235;&#239;"/>
 <gentext key="SetIndex" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239; &#211;&#245;&#237;&#252;&#235;&#249;&#237;"/>
 <gentext key="setindex" text="&#197;&#245;&#241;&#229;&#244;&#222;&#241;&#233;&#239; &#211;&#245;&#237;&#252;&#235;&#249;&#237;"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="&#229;&#240;&#229;&#238;&#231;&#227;&#231;&#236;&#225;&#244;&#233;&#234;&#252; &#240;&#235;&#229;&#245;&#241;&#233;&#234;&#252; &#225;&#241;&#232;&#241;&#223;&#228;&#233;&#239;"/>
 <gentext key="Step" text="&#214;&#220;&#243;&#231;"/>
-<gentext key="TIP" text="&#213;&#208;&#207;&#196;&#197;&#201;&#206;&#199;"/>
+<gentext key="step" text="&#246;&#220;&#243;&#231;"/>
 <gentext key="Table" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242;"/>
 <gentext key="table" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242;"/>
+<gentext key="TIP" text="&#213;&#208;&#207;&#196;&#197;&#201;&#206;&#199;"/>
 <gentext key="Tip" text="&#213;&#240;&#252;&#228;&#229;&#233;&#238;&#231;"/>
 <gentext key="tip" text="&#213;&#240;&#252;&#228;&#229;&#233;&#238;&#231;"/>
 <gentext key="WARNING" text="&#208;&#209;&#207;&#197;&#201;&#196;&#207;&#208;&#207;&#201;&#199;&#211;&#199;"/>
 <gentext key="Warning" text="&#208;&#241;&#239;&#229;&#233;&#228;&#239;&#240;&#239;&#223;&#231;&#243;&#231;"/>
 <gentext key="warning" text="&#208;&#241;&#239;&#229;&#233;&#228;&#239;&#240;&#239;&#223;&#231;&#243;&#231;"/>
-<gentext key="appendix" text="&#240;&#225;&#241;&#220;&#241;&#244;&#231;&#236;&#225;"/>
-<gentext key="chapter" text="&#234;&#229;&#246;&#220;&#235;&#225;&#233;&#239;"/>
-<gentext key="section" text="&#244;&#236;&#222;&#236;&#225;"/>
-<gentext key="sidebar" text="&#229;&#240;&#229;&#238;&#231;&#227;&#231;&#236;&#225;&#244;&#233;&#234;&#252; &#240;&#235;&#229;&#245;&#241;&#233;&#234;&#252; &#225;&#241;&#232;&#241;&#223;&#228;&#233;&#239;"/>
-<gentext key="step" text="&#246;&#220;&#243;&#231;"/>
-<gentext key="Seealso" text="&#196;&#229;&#223;&#244;&#229; &#229;&#240;&#223;&#243;&#231;&#242;"/>
 
-<gentext key="TableofContents" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#208;&#229;&#241;&#233;&#229;&#247;&#239;&#236;&#221;&#237;&#249;&#237;"/>
-<gentext key="tableofcontents" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#208;&#229;&#241;&#233;&#229;&#247;&#239;&#236;&#221;&#237;&#249;&#237;"/>
-<gentext key="in" text="&#243;&#229;"/>
+<gentext key="and" text="&#234;&#225;&#233;"/>
 <gentext key="by" text="&#225;&#240;&#252;"/>
 <gentext key="Edited" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225;"/>
 <gentext key="edited" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225;"/>
 <gentext key="Editedby" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225; &#225;&#240;&#252;"/>
 <gentext key="editedby" text="&#197;&#240;&#233;&#236;&#221;&#235;&#229;&#233;&#225; &#225;&#240;&#252;"/>
-<gentext key="and" text="&#234;&#225;&#233;"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="&#243;&#229;"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="&#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#233;&#242;"/>
-<gentext key="notes" text="&#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#233;&#242;"/>
-<gentext key="TableNotes" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#249;&#237;"/>
-<gentext key="tablenotes" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#249;&#237;"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="&#236;&#231;-&#245;&#240;&#225;&#241;&#234;&#244;&#252; &#243;&#244;&#239;&#233;&#247;&#229;&#223;&#239;"/>
+<gentext key="notes" text="&#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#233;&#242;"/>
+<gentext key="Notes" text="&#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#233;&#242;"/>
 <gentext key="Pgs" text="&#211;&#235;&#228;&#242;."/>
 <gentext key="pgs" text="&#211;&#235;&#228;&#242;."/>
-<gentext key="unsupported" text="&#236;&#231; &#245;&#240;&#239;&#243;&#244;&#231;&#241;&#233;&#230;&#252;&#236;&#229;&#237;&#239;"/>
-<gentext key="xrefto" text="&#225;&#237;&#244;&#233;&#240;&#225;&#241;&#225;&#240;&#239;&#236;&#240;&#222; &#243;&#229;"/>
-<gentext key="unexpectedelementname" text="&#204;&#231; &#225;&#237;&#225;&#236;&#229;&#237;&#252;&#236;&#229;&#237;&#239; &#252;&#237;&#239;&#236;&#225; &#243;&#244;&#239;&#233;&#247;&#229;&#223;&#239;&#245;"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#249;&#237;"/>
+<gentext key="tablenotes" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#211;&#231;&#236;&#229;&#233;&#254;&#243;&#229;&#249;&#237;"/>
+<gentext key="TableofContents" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#208;&#229;&#241;&#233;&#229;&#247;&#239;&#236;&#221;&#237;&#249;&#237;"/>
+<gentext key="tableofcontents" text="&#208;&#223;&#237;&#225;&#234;&#225;&#242; &#208;&#229;&#241;&#233;&#229;&#247;&#239;&#236;&#221;&#237;&#249;&#237;"/>
+<gentext key="unexpectedelementname" text="&#204;&#231; &#225;&#237;&#225;&#236;&#229;&#237;&#252;&#236;&#229;&#237;&#239; &#252;&#237;&#239;&#236;&#225; &#243;&#244;&#239;&#233;&#247;&#229;&#223;&#239;&#245;"/>
+<gentext key="unsupported" text="&#236;&#231; &#245;&#240;&#239;&#243;&#244;&#231;&#241;&#233;&#230;&#252;&#236;&#229;&#237;&#239;"/>
+<gentext key="xrefto" text="&#225;&#237;&#244;&#233;&#240;&#225;&#241;&#225;&#240;&#239;&#236;&#240;&#222; &#243;&#229;"/>
 
-<gentext key="ListofTables" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#233;&#237;&#220;&#234;&#249;&#237;"/>
-<gentext key="listoftables" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#233;&#237;&#220;&#234;&#249;&#237;"/>
+<gentext key="listofequations" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#197;&#238;&#233;&#243;&#254;&#243;&#229;&#249;&#237;"/>
+<gentext key="ListofEquations" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#197;&#238;&#233;&#243;&#254;&#243;&#229;&#249;&#237;"/>
 <gentext key="ListofExamples" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#225;&#241;&#225;&#228;&#229;&#233;&#227;&#236;&#220;&#244;&#249;&#237;"/>
 <gentext key="listofexamples" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#225;&#241;&#225;&#228;&#229;&#233;&#227;&#236;&#220;&#244;&#249;&#237;"/>
 <gentext key="ListofFigures" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#211;&#247;&#231;&#236;&#220;&#244;&#249;&#237;"/>
 <gentext key="listoffigures" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#211;&#247;&#231;&#236;&#220;&#244;&#249;&#237;"/>
-<gentext key="ListofEquations" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#197;&#238;&#233;&#243;&#254;&#243;&#229;&#249;&#237;"/>
-<gentext key="listofequations" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#197;&#238;&#233;&#243;&#254;&#243;&#229;&#249;&#237;"/>
+<gentext key="listoftables" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#233;&#237;&#220;&#234;&#249;&#237;"/>
+<gentext key="ListofTables" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#208;&#233;&#237;&#220;&#234;&#249;&#237;"/>
 <gentext key="ListofUnknown" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#193;&#227;&#237;&#254;&#243;&#244;&#249;&#237;"/>
 <gentext key="listofunknown" text="&#202;&#225;&#244;&#220;&#235;&#239;&#227;&#239;&#242; &#193;&#227;&#237;&#254;&#243;&#244;&#249;&#237;"/>
 
+<gentext key="nav-home" text="&#193;&#241;&#247;&#222;"/>
+<gentext key="nav-next" text="&#197;&#240;&#252;&#236;&#229;&#237;&#239;"/>
+<gentext key="nav-next-sibling" text="&#208;&#241;&#239;&#242; &#244;&#239; &#244;&#221;&#235;&#239;&#242;"/>
 <gentext key="nav-prev" text="&#208;&#241;&#239;&#231;&#227;"/>
 <gentext key="nav-prev-sibling" text="&#208;&#241;&#239;&#242; &#244;&#231;&#237; &#225;&#241;&#247;&#222;"/>
-<gentext key="nav-next-sibling" text="&#208;&#241;&#239;&#242; &#244;&#239; &#244;&#221;&#235;&#239;&#242;"/>
-<gentext key="nav-next" text="&#197;&#240;&#252;&#236;&#229;&#237;&#239;"/>
 <gentext key="nav-up" text="&#208;&#220;&#237;&#249;"/>
-<gentext key="nav-home" text="&#193;&#241;&#247;&#222;"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -353,9 +353,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/en.xml b/gentext/locale/en.xml
index fae15b989..3677b0197 100644
--- a/gentext/locale/en.xml
+++ b/gentext/locale/en.xml
@@ -17,6 +17,7 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/>
 <gentext key="Appendix" text="Appendix"/>
+<gentext key="appendix" text="appendix"/>
 <gentext key="Article" text="Article"/>
 <gentext key="article" text="Article"/>
 <gentext key="Bibliography" text="Bibliography"/>
@@ -27,6 +28,7 @@
 <gentext key="Caution" text="Caution"/>
 <gentext key="caution" text="Caution"/>
 <gentext key="Chapter" text="Chapter"/>
+<gentext key="chapter" text="chapter"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/>
 <gentext key="Copyright" text="Copyright"/>
@@ -41,19 +43,19 @@
 <gentext key="example" text="Example"/>
 <gentext key="Figure" text="Figure"/>
 <gentext key="figure" text="Figure"/>
+<gentext key="Glossary" text="Glossary"/>
+<gentext key="glossary" text="Glossary"/>
 <gentext key="GlossSee" text="See"/>
 <gentext key="glosssee" text="See"/>
 <gentext key="GlossSeeAlso" text="See Also"/>
 <gentext key="glossseealso" text="See Also"/>
-<gentext key="Glossary" text="Glossary"/>
-<gentext key="glossary" text="Glossary"/>
 <gentext key="IMPORTANT" text="IMPORTANT"/>
 <gentext key="important" text="Important"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Important"/>
 <gentext key="Index" text="Index"/>
 <gentext key="index" text="Index"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Legal Notice"/>
 <gentext key="legalnotice" text="Legal Notice"/>
 <gentext key="MsgAud" text="Audience"/>
@@ -86,82 +88,80 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/>
-<gentext key="Revision" text="Revision"/>
-<gentext key="revision" text="Revision"/>
 <gentext key="RevHistory" text="Revision History"/>
 <gentext key="revhistory" text="Revision History"/>
+<gentext key="revision" text="Revision"/>
+<gentext key="Revision" text="Revision"/>
+<gentext key="sect1" text="Section"/>
+<gentext key="sect2" text="Section"/>
+<gentext key="sect3" text="Section"/>
+<gentext key="sect4" text="Section"/>
+<gentext key="sect5" text="Section"/>
+<gentext key="section" text="Section"/>
 <gentext key="Section" text="Section"/>
 <gentext key="See" text="See"/>
 <gentext key="see" text="See"/>
 <gentext key="SeeAlso" text="See Also"/>
 <gentext key="seealso" text="See Also"/>
-<gentext key="Set" text="Set"/>
+<gentext key="Seealso" text="See also"/>
 <gentext key="set" text="Set"/>
-<gentext key="SetIndex" text="Set Index"/>
+<gentext key="Set" text="Set"/>
 <gentext key="setindex" text="Set Index"/>
+<gentext key="SetIndex" text="Set Index"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="sidebar"/>
+<gentext key="step" text="step"/>
 <gentext key="Step" text="Step"/>
-<gentext key="TIP" text="TIP"/>
 <gentext key="Table" text="Table"/>
 <gentext key="table" text="Table"/>
-<gentext key="Tip" text="Tip"/>
 <gentext key="tip" text="Tip"/>
-<gentext key="WARNING" text="WARNING"/>
+<gentext key="TIP" text="TIP"/>
+<gentext key="Tip" text="Tip"/>
 <gentext key="Warning" text="Warning"/>
 <gentext key="warning" text="Warning"/>
-<gentext key="appendix" text="appendix"/>
-<gentext key="chapter" text="chapter"/>
-<gentext key="section" text="Section"/>
-<gentext key="sect1" text="Section"/>
-<gentext key="sect2" text="Section"/>
-<gentext key="sect3" text="Section"/>
-<gentext key="sect4" text="Section"/>
-<gentext key="sect5" text="Section"/>
-<gentext key="sidebar" text="sidebar"/>
-<gentext key="step" text="step"/>
-<gentext key="Seealso" text="See also"/>
+<gentext key="WARNING" text="WARNING"/>
 
-<gentext key="TableofContents" text="Table of Contents"/>
-<gentext key="tableofcontents" text="Table of Contents"/>
-<gentext key="in" text="in"/>
+<gentext key="and" text="and"/>
 <gentext key="by" text="by"/>
 <gentext key="Edited" text="Edited"/>
 <gentext key="edited" text="Edited"/>
 <gentext key="Editedby" text="Edited by"/>
 <gentext key="editedby" text="Edited by"/>
-<gentext key="and" text="and"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="in"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notes"/>
-<gentext key="notes" text="Notes"/>
-<gentext key="TableNotes" text="Notes"/>
-<gentext key="tablenotes" text="Notes"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="non-existant element"/>
+<gentext key="notes" text="Notes"/>
+<gentext key="Notes" text="Notes"/>
 <gentext key="Pgs" text="Pgs."/>
 <gentext key="pgs" text="Pgs."/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/>
+<gentext key="TableNotes" text="Notes"/>
+<gentext key="tablenotes" text="Notes"/>
+<gentext key="TableofContents" text="Table of Contents"/>
+<gentext key="tableofcontents" text="Table of Contents"/>
+<gentext key="unexpectedelementname" text="Unexpected element name"/>
+<gentext key="unsupported" text="unsupported"/>
+<gentext key="xrefto" text="xref to"/>
 
-<gentext key="ListofTables" text="List of Tables"/>
-<gentext key="listoftables" text="List of Tables"/>
+<gentext key="listofequations" text="List of Equations"/>
+<gentext key="ListofEquations" text="List of Equations"/>
 <gentext key="ListofExamples" text="List of Examples"/>
 <gentext key="listofexamples" text="List of Examples"/>
 <gentext key="ListofFigures" text="List of Figures"/>
 <gentext key="listoffigures" text="List of Figures"/>
-<gentext key="ListofEquations" text="List of Equations"/>
-<gentext key="listofequations" text="List of Equations"/>
+<gentext key="listoftables" text="List of Tables"/>
+<gentext key="ListofTables" text="List of Tables"/>
 <gentext key="ListofUnknown" text="List of Unknown"/>
 <gentext key="listofunknown" text="List of Unknown"/>
 
+<gentext key="nav-home" text="Home"/>
+<gentext key="nav-next" text="Next"/>
+<gentext key="nav-next-sibling" text="Fast Forward"/>
 <gentext key="nav-prev" text="Prev"/>
 <gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
 <gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
 
 <gentext key="sectioncalled"       text="the section called"/>
 
@@ -227,8 +227,8 @@
 <template name="qandaentry">%t</template>
 <template name="qandaset">%t</template>
 <template name="question">%t</template>
-<template name="reference">%t</template>
 <template name="refentry">%t</template>
+<template name="reference">%t</template>
 <template name="refsect1">%t</template>
 <template name="refsect2">%t</template>
 <template name="refsect3">%t</template>
@@ -249,6 +249,7 @@
 
 <context name="section-title">
 
+<template name="bridgehead">%t</template>
 <template name="sect1">%t</template>
 <template name="sect2">%t</template>
 <template name="sect3">%t</template>
@@ -256,12 +257,12 @@
 <template name="sect5">%t</template>
 <template name="section">%t</template>
 <template name="simplesect">%t</template>
-<template name="bridgehead">%t</template>
 
 </context>
 
 <context name="section-title-numbered">
 
+<template name="bridgehead">%n. %t</template>
 <template name="sect1">%n. %t</template>
 <template name="sect2">%n. %t</template>
 <template name="sect3">%n. %t</template>
@@ -269,7 +270,6 @@
 <template name="sect5">%n. %t</template>
 <template name="section">%n. %t</template>
 <template name="simplesect">%t</template>
-<template name="bridgehead">%n. %t</template>
 
 </context>
 
@@ -346,6 +346,7 @@
 
 <context name="section-xref">
 
+<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
 <template name="sect1"><sectioncalled/> &#x201C;%t&#x201D;</template>
 <template name="sect2"><sectioncalled/> &#x201C;%t&#x201D;</template>
 <template name="sect3"><sectioncalled/> &#x201C;%t&#x201D;</template>
@@ -353,12 +354,12 @@
 <template name="sect5"><sectioncalled/> &#x201C;%t&#x201D;</template>
 <template name="section"><sectioncalled/> &#x201C;%t&#x201D;</template>
 <template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="bridgehead"><sectioncalled/> &#x201C;%t&#x201D;</template>
 
 </context>
 
 <context name="section-xref-numbered">
 
+<template name="bridgehead"><Section/> %n</template>
 <template name="sect1"><Section/> %n</template>
 <template name="sect2"><Section/> %n</template>
 <template name="sect3"><Section/> %n</template>
@@ -366,7 +367,6 @@
 <template name="sect5"><Section/> %n</template>
 <template name="section"><Section/> %n</template>
 <template name="simplesect"><sectioncalled/> &#x201C;%t&#x201D;</template>
-<template name="bridgehead"><Section/> %n</template>
 
 </context>
 
@@ -382,9 +382,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/es.xml b/gentext/locale/es.xml
index 9338bf8bf..e1fe95a73 100644
--- a/gentext/locale/es.xml
+++ b/gentext/locale/es.xml
@@ -22,16 +22,18 @@
 <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="Bibliography" text="Bibliograf&iacute;a"/>
 <gentext key="bibliography" text="Bibliograf&iacute;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="CAUTION" text="ATENCI&Oacute;N"/>
 <gentext key="Chapter" text="Cap&iacute;tulo"/>
+<gentext key="chapter" text="cap&iacute;tulo"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
@@ -46,19 +48,19 @@
 <gentext key="example" text="Ejemplo"/>
 <gentext key="Figure" text="Figura"/>
 <gentext key="figure" text="Figura"/>
+<gentext key="Glossary" text="Glosario"/>
+<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="Glossary" text="Glosario"/>
-<gentext key="glossary" text="Glosario"/>
 <gentext key="IMPORTANT" text="IMPORTANTE"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Importante"/>
 <gentext key="important" text="Importante"/>
 <gentext key="Index" text="&Iacute;ndice"/>
 <gentext key="index" text="&Iacute;ndice"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Aviso Legal"/>
 <gentext key="legalnotice" text="Aviso Legal"/>
 <gentext key="MsgAud" text="Audiencia"/>
@@ -67,11 +69,11 @@
 <gentext key="msglevel" text="Nivel"/>
 <gentext key="MsgOrig" text="Origen"/>
 <gentext key="msgorig" text="Origen"/>
+<gentext key="note" text="Nota"/>
 <gentext key="NOTE" text="NOTA"/>
 <gentext key="Note" text="Nota"/>
-<gentext key="note" text="Nota"/>
-<gentext key="Part" text="Parte"/>
 <gentext key="part" text="Parte"/>
+<gentext key="Part" text="Parte"/>
 <gentext key="Preface" text="Prefacio"/>
 <gentext key="preface" text="Prefacio"/>
 <gentext key="Procedure" text="Procedimiento"/>
@@ -85,88 +87,86 @@
 <gentext key="question" text="P:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
+<gentext key="Reference" text="Referencia"/>
+<gentext key="reference" text="Referencia"/>
 <gentext key="RefName" text="Nombre"/>
 <gentext key="refname" text="Nombre"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="Reference" text="Referencia"/>
-<gentext key="reference" text="Referencia"/>
-<gentext key="Revision" text="Revisi&oacute;n"/>
-<gentext key="revision" text="Revisi&oacute;n"/>
 <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="Section" text="Secci&oacute;n"/>
+<gentext key="section" text="secci&oacute;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&eacute;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="Sidebar" text="Sidebar"/> <!--usen-->
 <gentext key="sidebar" text="sidebar"/> <!--usen-->
+<gentext key="Sidebar" text="Sidebar"/> <!--usen-->
 <gentext key="Step" text="Paso"/>
-<gentext key="TIP" text="SUGERENCIA"/>
-<gentext key="Table" text="Tabla"/>
+<gentext key="step" text="paso"/>
 <gentext key="table" text="Tabla"/>
+<gentext key="Table" text="Tabla"/>
+<gentext key="TIP" text="SUGERENCIA"/>
 <gentext key="Tip" text="Sugerencia"/>
 <gentext key="tip" text="Sugerencia"/>
+<gentext key="warning" text="Aviso"/>
 <gentext key="WARNING" text="AVISO"/>
 <gentext key="Warning" text="Aviso"/>
-<gentext key="warning" text="Aviso"/>
-<gentext key="appendix" text="ap&eacute;ndice"/>
-<gentext key="chapter" text="cap&iacute;tulo"/>
-<gentext key="section" text="secci&oacute;n"/>
-<gentext key="step" text="paso"/>
-<gentext key="Seealso" text="Ver Tambi&eacute;n"/>
 
-<gentext key="TableofContents" text="Tabla de contenidos"/>
-<gentext key="tableofcontents" text="Tabla de contenidos"/>
-<gentext key="in" text="en"/>
+<gentext key="and" text="y"/>
 <gentext key="by" text="por"/>
 <gentext key="Edited" text="Editado"/>
 <gentext key="edited" text="Editado"/>
 <gentext key="Editedby" text="Editado por"/>
 <gentext key="editedby" text="Editado por"/>
-<gentext key="and" text="y"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="en"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notas"/>
-<gentext key="notes" text="Notas"/>
-<gentext key="TableNotes" text="Notas"/>
-<gentext key="tablenotes" text="Notas"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="elemento inexistente"/>
+<gentext key="notes" text="Notas"/>
+<gentext key="Notes" text="Notas"/>
 <gentext key="Pgs" text="Pags."/>
 <gentext key="pgs" text="Pags."/>
-<gentext key="unsupported" text="no soportado"/>
-<gentext key="xrefto" text="referido a"/>
-<gentext key="unexpectedelementname" text="Nombre de elemento inesperado"/>
 <gentext key="Revisedby" text="Revisado por: "/>
 <gentext key="revisedby" text="Revisado por: "/>
+<gentext key="TableNotes" text="Notas"/>
+<gentext key="tablenotes" text="Notas"/>
+<gentext key="TableofContents" text="Tabla de contenidos"/>
+<gentext key="tableofcontents" text="Tabla de contenidos"/>
+<gentext key="unexpectedelementname" text="Nombre de elemento inesperado"/>
+<gentext key="unsupported" text="no soportado"/>
+<gentext key="xrefto" text="referido a"/>
 
-<gentext key="ListofTables" text="Lista de tablas"/>
-<gentext key="listoftables" text="Lista de tablas"/>
+<gentext key="listofequations" text="Tabla de ecuaciones"/>
+<gentext key="ListofEquations" text="Tabla de ecuaciones"/>
 <gentext key="ListofExamples" text="Tabla de ejemplos"/>
 <gentext key="listofexamples" text="Tabla de ejemplos"/>
 <gentext key="ListofFigures" text="Tabla de figuras"/>
 <gentext key="listoffigures" text="Tabla de figuras"/>
-<gentext key="ListofEquations" text="Tabla de ecuaciones"/>
-<gentext key="listofequations" text="Tabla de ecuaciones"/>
+<gentext key="listoftables" text="Lista de tablas"/>
+<gentext key="ListofTables" text="Lista de tablas"/>
 <gentext key="ListofUnknown" text="Lista de ???"/>
 <gentext key="listofunknown" text="Lista de ???"/>
 
+<gentext key="nav-home" text="Inicio"/>
+<gentext key="nav-next" text="Siguiente"/>
+<gentext key="nav-next-sibling" text="Avanzar"/>
 <gentext key="nav-prev" text="Anterior"/>
 <gentext key="nav-prev-sibling" text="Retroceder"/>
-<gentext key="nav-next-sibling" text="Avanzar"/>
-<gentext key="nav-next" text="Siguiente"/>
 <gentext key="nav-up" text="Subir"/>
-<gentext key="nav-home" text="Inicio"/>
 
-<gentext key="sectioncalled" text="la secci&#243;n llamada"/>
 <gentext key="index symbols" text="S&#237;mbolos"/>
+<gentext key="sectioncalled" text="la secci&#243;n llamada"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -246,6 +246,7 @@
 
 <context name="section-title">
 
+<template name="bridgehead">%t</template>
 <template name="sect1">%t</template>
 <template name="sect2">%t</template>
 <template name="sect3">%t</template>
@@ -253,12 +254,12 @@
 <template name="sect5">%t</template>
 <template name="section">%t</template>
 <template name="simplesect">%t</template>
-<template name="bridgehead">%t</template>
 
 </context>
 
 <context name="section-title-numbered">
 
+<template name="bridgehead">%n. %t</template>
 <template name="sect1">%n. %t</template>
 <template name="sect2">%n. %t</template>
 <template name="sect3">%n. %t</template>
@@ -266,7 +267,6 @@
 <template name="sect5">%n. %t</template>
 <template name="section">%n. %t</template>
 <template name="simplesect">%t</template>
-<template name="bridgehead">%n. %t</template>
 
 </context>
 
@@ -314,8 +314,8 @@
 
 <context name="xref">
 
-<template name="appendix"><Appendix/> %n. %t</template>
 <template name="answer">R: %n</template>
+<template name="appendix"><Appendix/> %n. %t</template>
 <template name="article">%t</template>
 <template name="bibliography">%t</template>
 <template name="book">%t</template>
@@ -343,6 +343,7 @@
 
 <context name="section-xref">
 
+<template name="bridgehead">&#x201C;%t&#x201D;</template>
 <template name="sect1">&#x201C;%t&#x201D;</template>
 <template name="sect2">&#x201C;%t&#x201D;</template>
 <template name="sect3">&#x201C;%t&#x201D;</template>
@@ -350,12 +351,12 @@
 <template name="sect5">&#x201C;%t&#x201D;</template>
 <template name="section">&#x201C;%t&#x201D;</template>
 <template name="simplesect">&#x201C;%t&#x201D;</template>
-<template name="bridgehead">&#x201C;%t&#x201D;</template>
 
 </context>
 
 <context name="section-xref-numbered">
 
+<template name="bridgehead"><Section/> %n</template>
 <template name="sect1"><Section/> %n</template>
 <template name="sect2"><Section/> %n</template>
 <template name="sect3"><Section/> %n</template>
@@ -363,7 +364,6 @@
 <template name="sect5"><Section/> %n</template>
 <template name="section"><Section/> %n</template>
 <template name="simplesect">&#x201C;%t&#x201D;</template>
-<template name="bridgehead"><Section/> %n</template>
 
 </context>
 
@@ -379,9 +379,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/et.xml b/gentext/locale/et.xml
index 530315f35..5f3edb9fc 100644
--- a/gentext/locale/et.xml
+++ b/gentext/locale/et.xml
@@ -19,16 +19,18 @@
 <gentext key="Answer" text="V:"/>
 <gentext key="answer" text="V:"/>
 <gentext key="Appendix" text="Lisa"/>
+<gentext key="appendix" text="lisa"/>
 <gentext key="Article" text="Artikkel"/>
 <gentext key="article" text="Artikkel"/>
 <gentext key="Bibliography" text="Bibliograafia"/>
 <gentext key="bibliography" text="Bibliograafia"/>
 <gentext key="Book" text="Raamat"/>
 <gentext key="book" text="Raamat"/>
-<gentext key="CAUTION" text="ETTEVAATUST"/>
 <gentext key="Caution" text="Ettevaatust"/>
 <gentext key="caution" text="Ettevaatust"/>
+<gentext key="CAUTION" text="ETTEVAATUST"/>
 <gentext key="Chapter" text="Peat&#252;kk"/> <!-- "Peat&#252;kk" -->
+<gentext key="chapter" text="peat&#252;kk"/> <!-- "peat&#252;kk" -->
 <gentext key="Colophon" text="L&#245;pum&#228;rgis"/>
 <gentext key="colophon" text="L&#245;pum&#228;rgis"/> <!-- "L&#245;pum&#228;rgis" -->
 <gentext key="Copyright" text="Autori&#245;igus"/>
@@ -41,21 +43,21 @@
 <gentext key="equation" text="Valem"/>
 <gentext key="Example" text="N&#228;ide"/>
 <gentext key="example" text="N&#228;ide"/> <!-- "N&#228;ide" -->
-<gentext key="Figure" text="Joonis"/>
 <gentext key="figure" text="Joonis"/>
+<gentext key="Figure" text="Joonis"/>
+<gentext key="Glossary" text="S&#245;nastik"/>
+<gentext key="glossary" text="S&#245;nastik"/> <!-- "S&#245;nastik" -->
 <gentext key="GlossSee" text="Vt."/>
 <gentext key="glosssee" text="Vt."/>
 <gentext key="GlossSeeAlso" text="Vt. ka"/>
 <gentext key="glossseealso" text="Vt. ka"/>
-<gentext key="Glossary" text="S&#245;nastik"/>
-<gentext key="glossary" text="S&#245;nastik"/> <!-- "S&#245;nastik" -->
 <gentext key="IMPORTANT" text="OLULINE"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Oluline"/>
 <gentext key="important" text="Oluline"/>
 <gentext key="Index" text="Aineregister"/>
 <gentext key="index" text="Aineregister"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Autori&#245;iguse m&#228;rge"/>
 <gentext key="legalnotice" text="Autori&#245;iguse m&#228;rge"/> <!-- "Autori&#245;iguse m&#228;rge" -->
 <gentext key="MsgAud" text="Auditoorium"/>
@@ -87,77 +89,75 @@
 <gentext key="refsection" text="L&#245;ik"/> <!-- "L&#245;ik" -->
 <gentext key="RefSynopsisDiv" text="S&#252;nopsis"/>
 <gentext key="refsynopsisdiv" text="S&#252;nopsis"/> <!-- "S&#252;nopsis" -->
-<gentext key="Revision" text="Vigade parandus"/>
-<gentext key="revision" text="Vigade parandus"/>
 <gentext key="RevHistory" text="Vigade paranduste ajalugu"/>
 <gentext key="revhistory" text="Vigade paranduste ajalugu"/>
+<gentext key="Revision" text="Vigade parandus"/>
+<gentext key="revision" text="Vigade parandus"/>
+<gentext key="section" text="l&#245;ik"/> <!-- "l&#245;ik" -->
 <gentext key="Section" text="Sektsioon"/>
-<gentext key="See" text="Vt."/>
 <gentext key="see" text="Vt."/>
-<gentext key="SeeAlso" text="Vt. ka"/>
+<gentext key="See" text="Vt."/>
 <gentext key="seealso" text="Vt. ka"/>
+<gentext key="SeeAlso" text="Vt. ka"/>
+<gentext key="Seealso" text="Vt. ka"/>
 <gentext key="Set" text="Sea"/>
 <gentext key="set" text="Sea"/>
 <gentext key="SetIndex" text="Sea indeks"/>
 <gentext key="setindex" text="Sea indeks"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="k&#252;lgriba"/> <!-- "k&#252;lgriba" -->
+<gentext key="step" text="samm"/>
 <gentext key="Step" text="Samm"/>
-<gentext key="TIP" text="VIHJE"/>
-<gentext key="Table" text="Tabel"/>
 <gentext key="table" text="Tabel"/>
+<gentext key="Table" text="Tabel"/>
+<gentext key="TIP" text="VIHJE"/>
 <gentext key="Tip" text="Vihje"/>
 <gentext key="tip" text="Vihje"/>
 <gentext key="WARNING" text="HOIATUS"/>
 <gentext key="Warning" text="Hoiatus"/>
 <gentext key="warning" text="Hoiatus"/>
-<gentext key="appendix" text="lisa"/>
-<gentext key="chapter" text="peat&#252;kk"/> <!-- "peat&#252;kk" -->
-<gentext key="section" text="l&#245;ik"/> <!-- "l&#245;ik" -->
-<gentext key="sidebar" text="k&#252;lgriba"/> <!-- "k&#252;lgriba" -->
-<gentext key="step" text="samm"/>
-<gentext key="Seealso" text="Vt. ka"/>
 
-<gentext key="TableofContents" text="Sisukord"/>
-<gentext key="tableofcontents" text="Sisukord"/>
-<gentext key="in" text=""/>
+<gentext key="and" text="ja"/>
 <gentext key="by" text=""/>
 <gentext key="Edited" text="Redaktsioon"/>
 <gentext key="edited" text="Redaktsioon"/>
 <gentext key="Editedby" text="Redaktsiooni autor(id)"/>
 <gentext key="editedby" text="Redaktsiooni autor(id)"/>
-<gentext key="and" text="ja"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text=""/>
 <gentext key="lastlistcomma" text=","/>
+<gentext key="listcomma" text=","/>
+<gentext key="nonexistantelement" text="mitte eksisteeriv element"/>
 <gentext key="Notes" text="M&#228;rkused"/>
 <gentext key="notes" text="M&#228;rkused"/> <!-- "M&#228;rkused" -->
-<gentext key="TableNotes" text="M&#228;rkused"/>
-<gentext key="tablenotes" text="M&#228;rkused"/> <!-- "M&#228;rkused" -->
-<gentext key="nonexistantelement" text="mitte eksisteeriv element"/>
 <gentext key="Pgs" text="Lk."/>
 <gentext key="pgs" text="Lk."/>
-<gentext key="unsupported" text="toetuseta"/>
-<gentext key="xrefto" text="viide"/>
-<gentext key="unexpectedelementname" text="Ootamatu elemendi nimi"/>
 <gentext key="Revisedby" text="&#220;le vaadanud: "/>
 <gentext key="revisedby" text="&#220;le vaadanud: "/> <!-- "&#220;le vaadanud: " -->
+<gentext key="TableNotes" text="M&#228;rkused"/>
+<gentext key="tablenotes" text="M&#228;rkused"/> <!-- "M&#228;rkused" -->
+<gentext key="TableofContents" text="Sisukord"/>
+<gentext key="tableofcontents" text="Sisukord"/>
+<gentext key="unexpectedelementname" text="Ootamatu elemendi nimi"/>
+<gentext key="unsupported" text="toetuseta"/>
+<gentext key="xrefto" text="viide"/>
 
-<gentext key="ListofTables" text="Tabelite nimekiri"/>
-<gentext key="listoftables" text="Tabelite nimekiri"/>
+<gentext key="listofequations" text="Valemite nimekiri"/>
+<gentext key="ListofEquations" text="Valemite nimekiri"/>
 <gentext key="ListofExamples" text="N&#228;idete nimekiri"/>
 <gentext key="listofexamples" text="N&#228;idete nimekiri"/> <!-- "N&#228;idete nimekiri" -->
 <gentext key="ListofFigures" text="Jooniste nimekiri"/>
 <gentext key="listoffigures" text="Jooniste nimekiri"/>
-<gentext key="ListofEquations" text="Valemite nimekiri"/>
-<gentext key="listofequations" text="Valemite nimekiri"/>
+<gentext key="listoftables" text="Tabelite nimekiri"/>
+<gentext key="ListofTables" text="Tabelite nimekiri"/>
 <gentext key="ListofUnknown" text="Tundmatute nimekiri"/>
 <gentext key="listofunknown" text="Tundmatute nimekiri"/>
 
+<gentext key="nav-home" text="Koju"/>
+<gentext key="nav-next" text="J&#228;rgmine"/> <!-- "J&#228;rgmine" -->
+<gentext key="nav-next-sibling" text="Kiiresti edasi"/>
 <gentext key="nav-prev" text="Eelmine"/>
 <gentext key="nav-prev-sibling" text="Kiiresti tagasi"/>
-<gentext key="nav-next-sibling" text="Kiiresti edasi"/>
-<gentext key="nav-next" text="J&#228;rgmine"/> <!-- "J&#228;rgmine" -->
 <gentext key="nav-up" text="&#220;les"/> <!-- "&#220;les" -->
-<gentext key="nav-home" text="Koju"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -353,9 +353,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/fi.xml b/gentext/locale/fi.xml
index f189f8561..006856222 100644
--- a/gentext/locale/fi.xml
+++ b/gentext/locale/fi.xml
@@ -19,16 +19,18 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/> <!-- en -->
 <gentext key="Appendix" text="Liite"/>
+<gentext key="appendix" text="liite"/>
 <gentext key="Article" text="Artikkeli"/>
 <gentext key="article" text="Artikkeli"/>
 <gentext key="Bibliography" text="L&#228;hteet"/>
 <gentext key="bibliography" text="L&#228;hteet"/>
 <gentext key="Book" text="Kirja"/>
 <gentext key="book" text="Kirja"/>
-<gentext key="CAUTION" text="VARO"/>
 <gentext key="Caution" text="Varo"/>
 <gentext key="caution" text="Varo"/>
+<gentext key="CAUTION" text="VARO"/>
 <gentext key="Chapter" text="Luku"/>
+<gentext key="chapter" text="luku"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Esimerkki"/>
 <gentext key="Figure" text="Kuva"/>
 <gentext key="figure" text="Kuva"/>
+<gentext key="Glossary" text="Sanasto"/>
+<gentext key="glossary" text="Sanasto"/>
 <gentext key="GlossSee" text="Katso"/>
 <gentext key="glosssee" text="Katso"/>
 <gentext key="GlossSeeAlso" text="Katso my&#246;s"/>
 <gentext key="glossseealso" text="Katso my&#246;s"/>
-<gentext key="Glossary" text="Sanasto"/>
-<gentext key="glossary" text="Sanasto"/>
 <gentext key="IMPORTANT" text="T&#196;RKE&#196;&#196;"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="T&#228;rke&#228;&#228;"/>
 <gentext key="important" text="T&#228;rke&#228;&#228;"/>
 <gentext key="Index" text="Indeksi"/>
 <gentext key="index" text="Indeksi"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text=""/>
 <gentext key="legalnotice" text=""/>
 <gentext key="MsgAud" text="Yleis&#246;"/>
@@ -64,9 +66,9 @@
 <gentext key="msglevel" text="Taso"/>
 <gentext key="MsgOrig" text="Alkuper&#228;"/>
 <gentext key="msgorig" text="Alkuper&#228;"/>
+<gentext key="note" text="Huomaa"/>
 <gentext key="NOTE" text="HUOMAA"/>
 <gentext key="Note" text="Huomaa"/>
-<gentext key="note" text="Huomaa"/>
 <gentext key="Part" text="Osa"/>
 <gentext key="part" text="Osa"/>
 <gentext key="Preface" text="Esipuhe"/>
@@ -79,85 +81,83 @@
 <gentext key="question" text="Q:"/> <!-- en -->
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="RefName" text="Nimi"/>
-<gentext key="refname" text="Nimi"/>
 <gentext key="Reference" text="L&#228;hdeluettelo"/>
 <gentext key="reference" text="L&#228;hdeluettelo"/>
+<gentext key="RefName" text="Nimi"/>
+<gentext key="refname" text="Nimi"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="Revision" text="Versio"/>
-<gentext key="revision" text="Versio"/>
 <gentext key="RevHistory" text="Versiohistoria"/>
 <gentext key="revhistory" text="Versiohistoria"/>
+<gentext key="Revision" text="Versio"/>
+<gentext key="revision" text="Versio"/>
 <gentext key="Section" text="Kohta"/>
-<gentext key="See" text="Katso"/>
+<gentext key="section" text="kohta"/>
 <gentext key="see" text="Katso"/>
-<gentext key="SeeAlso" text="Katso my&#246;s"/>
+<gentext key="See" text="Katso"/>
+<gentext key="Seealso" text="Katso my&#246;s"/>
 <gentext key="seealso" text="Katso my&#246;s"/>
-<gentext key="Set" text="Kokoelma"/>
+<gentext key="SeeAlso" text="Katso my&#246;s"/>
 <gentext key="set" text="Kokoelma"/>
+<gentext key="Set" text="Kokoelma"/>
 <gentext key="SetIndex" text="Kokoelman indeksi"/>
 <gentext key="setindex" text="Kokoelman indeksi"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="sivupalkki"/>
+<gentext key="step" text="step"/>
 <gentext key="Step" text="Step"/>
-<gentext key="TIP" text="VIHJE"/>
-<gentext key="Table" text="Taulu"/>
 <gentext key="table" text="Taulu"/>
+<gentext key="Table" text="Taulu"/>
+<gentext key="TIP" text="VIHJE"/>
 <gentext key="Tip" text="Vihje"/>
 <gentext key="tip" text="Vihje"/>
 <gentext key="WARNING" text="VAROITUS"/>
 <gentext key="Warning" text="Varoitus"/>
 <gentext key="warning" text="Varoitus"/>
-<gentext key="appendix" text="liite"/>
-<gentext key="chapter" text="luku"/>
-<gentext key="section" text="kohta"/>
-<gentext key="sidebar" text="sivupalkki"/>
-<gentext key="step" text="step"/>
-<gentext key="Seealso" text="Katso my&#246;s"/>
 
-<gentext key="TableofContents" text="Sis&#228;llys"/>
-<gentext key="tableofcontents" text="Sis&#228;llys"/>
-<gentext key="in" text="teoksessa"/>
+<gentext key="and" text="ja"/>
 <gentext key="by" text=""/>
 <gentext key="Edited" text="Toim."/>
 <gentext key="edited" text="Toim."/>
 <gentext key="Editedby" text="Toimittanut"/>
 <gentext key="editedby" text="Toimittanut"/>
-<gentext key="and" text="ja"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="teoksessa"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text=""/>
-<gentext key="notes" text=""/>
-<gentext key="TableNotes" text=""/>
-<gentext key="tablenotes" text=""/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="elementti&#228; ei ole olemassa"/>
+<gentext key="notes" text=""/>
+<gentext key="Notes" text=""/>
 <gentext key="Pgs" text="Sivut"/>
 <gentext key="pgs" text="Sivut"/>
-<gentext key="unsupported" text="ei tueta"/>
-<gentext key="xrefto" text="xref johonkin"/>
-<gentext key="unexpectedelementname" text="Odottamaton elementin nimi"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text=""/>
+<gentext key="tablenotes" text=""/>
+<gentext key="TableofContents" text="Sis&#228;llys"/>
+<gentext key="tableofcontents" text="Sis&#228;llys"/>
+<gentext key="unexpectedelementname" text="Odottamaton elementin nimi"/>
+<gentext key="unsupported" text="ei tueta"/>
+<gentext key="xrefto" text="xref johonkin"/>
 
-<gentext key="ListofTables" text="Luettelo tauluista"/>
-<gentext key="listoftables" text="Luettelo tauluista"/>
+<gentext key="listofequations" text="Luettelo esimerkeist&#228;"/>
+<gentext key="ListofEquations" text="Luettelo esimerkeist&#228;"/>
 <gentext key="ListofExamples" text="Luettelo esimerkeist&#228;"/>
 <gentext key="listofexamples" text="Luettelo esimerkeist&#228;"/>
 <gentext key="ListofFigures" text="Luettelo kuvista"/>
 <gentext key="listoffigures" text="Luettelo kuvista"/>
-<gentext key="ListofEquations" text="Luettelo esimerkeist&#228;"/>
-<gentext key="listofequations" text="Luettelo esimerkeist&#228;"/>
+<gentext key="listoftables" text="Luettelo tauluista"/>
+<gentext key="ListofTables" text="Luettelo tauluista"/>
 <gentext key="ListofUnknown" text="Luettelo tuntemattomista"/>
 <gentext key="listofunknown" text="Luettelo tuntemattomista"/>
 
+<gentext key="nav-home" text="Alkuun"/>
+<gentext key="nav-next" text="Seuraava"/>
+<gentext key="nav-next-sibling" text="Nopeasti eteenp&#x00E4;in"/>
 <gentext key="nav-prev" text="Edellinen"/>
 <gentext key="nav-prev-sibling" text="Nopeasti taaksep&#x00E4;in"/>
-<gentext key="nav-next-sibling" text="Nopeasti eteenp&#x00E4;in"/>
-<gentext key="nav-next" text="Seuraava"/>
 <gentext key="nav-up" text="Yl&#x00F6;s"/>
-<gentext key="nav-home" text="Alkuun"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -353,9 +353,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/fr.xml b/gentext/locale/fr.xml
index cab1fab43..c453152da 100644
--- a/gentext/locale/fr.xml
+++ b/gentext/locale/fr.xml
@@ -24,16 +24,18 @@
 <gentext key="Answer" text="R&#x00A0;:"/>
 <gentext key="answer" text="R&#x00A0;:"/>
 <gentext key="Appendix" text="Annexe"/>
+<gentext key="appendix" text="annexe"/>
 <gentext key="Article" text="Article"/>
 <gentext key="article" text="Article"/>
 <gentext key="Bibliography" text="Bibliographie"/>
 <gentext key="bibliography" text="Bibliographie"/>
 <gentext key="Book" text="Livre"/>
 <gentext key="book" text="Livre"/>
-<gentext key="CAUTION" text="ATTENTION"/>
 <gentext key="Caution" text="Attention"/>
 <gentext key="caution" text="Attention"/>
+<gentext key="CAUTION" text="ATTENTION"/>
 <gentext key="Chapter" text="Chapitre"/>
+<gentext key="chapter" text="chapitre"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/>
 <gentext key="Copyright" text="Copyright"/>
@@ -48,19 +50,19 @@
 <gentext key="example" text="Exemple"/>
 <gentext key="Figure" text="Figure"/>
 <gentext key="figure" text="Figure"/>
+<gentext key="Glossary" text="Glossaire"/>
+<gentext key="glossary" text="Glossaire"/>
 <gentext key="GlossSee" text="Voir"/>
 <gentext key="glosssee" text="Voir"/>
 <gentext key="GlossSeeAlso" text="Voir aussi"/>
 <gentext key="glossseealso" text="Voir aussi"/>
-<gentext key="Glossary" text="Glossaire"/>
-<gentext key="glossary" text="Glossaire"/>
 <gentext key="IMPORTANT" text="IMPORTANT"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Important"/>
 <gentext key="important" text="Important"/>
 <gentext key="Index" text="Index"/>
 <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;"/>
@@ -69,9 +71,9 @@
 <gentext key="msglevel" text="Niveau"/>
 <gentext key="MsgOrig" text="Origine"/>
 <gentext key="msgorig" text="Origine"/>
+<gentext key="Note" text="Note"/>
 <gentext key="NOTE" text="NOTE"/>
 <gentext key="note" text="NOTE"/>
-<gentext key="Note" text="Note"/>
 <gentext key="Part" text="Partie"/>
 <gentext key="part" text="Partie"/>
 <gentext key="Preface" text="Pr&eacute;face"/>
@@ -84,85 +86,83 @@
 <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="RefName" text="Nom"/>
 <gentext key="refname" text="Nom"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/>
-<gentext key="Reference" text="R&eacute;f&eacute;rence"/>
-<gentext key="reference" text="R&eacute;f&eacute;rence"/>
 <gentext key="RevHistory" text="Historique des versions"/>
 <gentext key="revhistory" text="Historique des versions"/>
 <gentext key="Revision" text="Version"/>
 <gentext key="revision" text="Version"/>
 <gentext key="Section" text="Section"/>
-<gentext key="See" text="Voir"/>
+<gentext key="section" text="section"/>
 <gentext key="see" text="Voir"/>
-<gentext key="SeeAlso" text="Voir Aussi"/>
+<gentext key="See" text="Voir"/>
 <gentext key="seealso" text="Voir Aussi"/>
+<gentext key="SeeAlso" text="Voir Aussi"/>
 <gentext key="Seealso" text="Voir aussi"/>
 <gentext key="Set" text="Ensemble"/>
 <gentext key="set" text="Ensemble"/>
-<gentext key="SetIndex" text="Index"/>
 <gentext key="setindex" text="Index"/>
+<gentext key="SetIndex" text="Index"/>
+<gentext key="sidebar" text=""/>
 <gentext key="Sidebar" text=""/>
 <gentext key="Step" text="&Eacute;tape"/>
-<gentext key="TIP" text="TUYAU"/>
-<gentext key="tip" text="TUYAU"/>
-<gentext key="Table" text="Tableau"/>
+<gentext key="step" text="&eacute;tape"/>
 <gentext key="table" text="Tableau"/>
+<gentext key="Table" text="Tableau"/>
+<gentext key="tip" text="TUYAU"/>
+<gentext key="TIP" text="TUYAU"/>
 <gentext key="Tip" text="Tuyau"/>
+<gentext key="Warning" text="Avertissement"/>
 <gentext key="WARNING" text="AVERTISSEMENT"/>
 <gentext key="warning" text="AVERTISSEMENT"/>
-<gentext key="Warning" text="Avertissement"/>
-<gentext key="appendix" text="annexe"/>
-<gentext key="chapter" text="chapitre"/>
-<gentext key="sidebar" text=""/>
-<gentext key="section" text="section"/>
-<gentext key="step" text="&eacute;tape"/>
 
-<gentext key="TableofContents" text="Table des mati&egrave;res"/>
-<gentext key="tableofcontents" text="Table des mati&egrave;res"/>
-<gentext key="in" text="dans"/>
+<gentext key="and" text="et"/>
 <gentext key="by" text="par"/>
 <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="and" text="et"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="dans"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notes"/>
-<gentext key="notes" text="Notes"/>
-<gentext key="TableNotes" text="Remarques"/>
-<gentext key="tablenotes" text="Remarques"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="Cet &eacute;l&eacute;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="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'&eacute;l&eacute;ment non attendu"/>
 <gentext key="Revisedby" text="Revu par&#x00A0;: "/>
 <gentext key="revisedby" text="Revu 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="unexpectedelementname" text="Nom d'&eacute;l&eacute;ment non attendu"/>
+<gentext key="unsupported" text="Non reconnu par le syst&egrave;me"/>
+<gentext key="xrefto" text="R&eacute;f&eacute;rence vers"/>
 
-<gentext key="ListofTables" text="Liste des tableaux"/>
-<gentext key="listoftables" text="Liste des tableaux"/>
+<gentext key="listofequations" text="Liste des &eacute;quations"/>
+<gentext key="ListofEquations" text="Liste des &eacute;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="ListofEquations" text="Liste des &eacute;quations"/>
-<gentext key="listofequations" text="Liste des &eacute;quations"/>
+<gentext key="listoftables" text="Liste des tableaux"/>
+<gentext key="ListofTables" text="Liste des tableaux"/>
 <gentext key="ListofUnknown" text="Liste des inconnues"/>
 <gentext key="listofunknown" text="Liste des inconnues"/>
 
+<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-next-sibling" text="Avance rapide"/>
-<gentext key="nav-next" text="Suivant"/>
 <gentext key="nav-up" text="Niveau sup&#x00E9;rieur"/>
-<gentext key="nav-home" text="Sommaire"/>
 
 <gentext key="sectioncalled" text="la section intitul&eacute;e" />
 
@@ -365,9 +365,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/hu.xml b/gentext/locale/hu.xml
index 5bd9207a8..08cfd1216 100644
--- a/gentext/locale/hu.xml
+++ b/gentext/locale/hu.xml
@@ -22,16 +22,18 @@
 <gentext key="Answer" text="V&#x00E1;lasz"/>
 <gentext key="answer" text="v&#x00E1;lasz"/>
 <gentext key="Appendix" text="F&#x00FC;ggel&#x00E9;k"/>
+<gentext key="appendix" text="f&#x00FC;ggel&#x00E9;k"/>
 <gentext key="Article" text="Cikk"/>
 <gentext key="article" text="cikk"/>
 <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="CAUTION" text="FIGYELEM"/>
 <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="Copyright" text="Copyright"/>
@@ -46,19 +48,19 @@
 <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="Glossary" text="Sz&#x00F3;jegyz&#x00E9;k"/>
-<gentext key="glossary" text="sz&#x00F3;jegyz&#x00E9;k"/>
 <gentext key="IMPORTANT" text="FONTOS"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="isbn"/>
 <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="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"/>
@@ -82,85 +84,83 @@
 <gentext key="question" text="k&#x00E9;rd&#x00E9;s"/>
 <gentext key="RefEntry" text="Bejegyz&#x00E9;s"/>
 <gentext key="refentry" text="bejegyz&#x00E9;s"/>
-<gentext key="RefName" text="N&#x00E9;v"/>
-<gentext key="refname" text="n&#x00E9;v"/>
 <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="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="Revision" text="Verzi&#x00F3;"/>
-<gentext key="revision" text="verzi&#x00F3;"/>
 <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="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="Seealso" text="L&#x00E1;sd m&#x00E9;g"/>
 <gentext key="Set" text="Set"/>
 <gentext key="set" text="Set"/> <!-- en -->
 <gentext key="SetIndex" text="Set Index"/>
 <gentext key="setindex" text="Set Index"/> <!-- en -->
+<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="TIP" text="TIPP"/>
-<gentext key="tip" text="tipp"/>
 <gentext key="Table" text="T&#x00E1;bl&#x00E1;zat"/>
 <gentext key="table" text="t&#x00E1;bl&#x00E1;zat"/>
+<gentext key="tip" text="tipp"/>
+<gentext key="TIP" text="TIPP"/>
 <gentext key="Tip" text="Tipp"/>
 <gentext key="WARNING" text="FIGYELEM"/>
 <gentext key="Warning" text="Figyelem"/>
 <gentext key="warning" text="figyelem"/>
-<gentext key="appendix" text="f&#x00FC;ggel&#x00E9;k"/>
-<gentext key="chapter" text="fejezet"/>
-<gentext key="section" text="szakasz"/>
-<gentext key="sidebar" text="sz&#x00E9;ljegyzet"/>
-<gentext key="step" text="l&#x00E9;p&#x00E9;s"/>
-<gentext key="Seealso" text="L&#x00E1;sd m&#x00E9;g"/>
 
-<gentext key="TableofContents" text="Tartalom"/>
-<gentext key="tableofcontents" text="tartalom"/>
-<gentext key="in" text=""/>
+<gentext key="and" text="&#x00E9;s"/>
 <gentext key="by" text=""/>
 <gentext key="Edited" text="Szerk."/>
 <gentext key="edited" text="szerk."/>
 <gentext key="Editedby" text="Szerkesztette"/>
 <gentext key="editedby" text="szerkesztette"/>
-<gentext key="and" text="&#x00E9;s"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text=""/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Megjegyz&#x00E9;sek"/>
-<gentext key="notes" text="megjegyz&#x00E9;sek"/>
-<gentext key="TableNotes" text="Megjegyz&#x00E9;sek"/>
-<gentext key="tablenotes" text="megjegyz&#x00E9;sek"/>
+<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="Pgs" text="Lsz."/>
 <gentext key="pgs" text="lsz."/>
-<gentext key="unsupported" text="nem t&#x00E1;mogatott"/>
-<gentext key="xrefto" text="keresztref"/>
-<gentext key="unexpectedelementname" text="nem v&#x00E1;rt elemn&#x00E9;v"/>
 <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="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="xrefto" text="keresztref"/>
 
-<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="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="ListofEquations" text="Az egyenletek list&#x00E1;ja"/>
-<gentext key="listofequations" text="az egyenletek 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="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-prev-sibling" text="Gyors vissza"/>
-<gentext key="nav-next-sibling" text="Gyors el&#x0151;re"/>
-<gentext key="nav-next" text="K&#x00F6;vetkez&#x0151;"/>
 <gentext key="nav-up" text="Fel"/>
-<gentext key="nav-home" text="Tartalom"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -356,9 +356,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/id.xml b/gentext/locale/id.xml
index 6f11c2ec1..75cb5ee9c 100644
--- a/gentext/locale/id.xml
+++ b/gentext/locale/id.xml
@@ -19,16 +19,18 @@
 <gentext key="Answer" text="Jawab:"/>
 <gentext key="answer" text="Jawab:"/>
 <gentext key="Appendix" text="Lampiran"/>
+<gentext key="appendix" text="lampiran"/>
 <gentext key="Article" text="Artikel"/>
 <gentext key="article" text="Artikel"/>
 <gentext key="Bibliography" text="Bibliografi"/>
 <gentext key="bibliography" text="Bibliografi"/>
 <gentext key="Book" text="Buku"/>
 <gentext key="book" text="Buku"/>
-<gentext key="CAUTION" text="PERHATIAN"/>
 <gentext key="Caution" text="Perhatian"/>
 <gentext key="caution" text="Perhatian"/>
+<gentext key="CAUTION" text="PERHATIAN"/>
 <gentext key="Chapter" text="Bab"/>
+<gentext key="chapter" text="bab"/>
 <gentext key="Colophon" text="Kolofon"/>
 <gentext key="colophon" text="Kolofon"/>
 <gentext key="Copyright" text="Hak Cipta"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Teladan"/>
 <gentext key="Figure" text="Gambar"/>
 <gentext key="figure" text="Gambar"/>
+<gentext key="Glossary" text="Daftar Istilah"/>
+<gentext key="glossary" text="Daftar Istilah"/>
 <gentext key="GlossSee" text="Lihat"/>
 <gentext key="glosssee" text="Lihat"/>
 <gentext key="GlossSeeAlso" text="Lihat Juga"/>
 <gentext key="glossseealso" text="Lihat Juga"/>
-<gentext key="Glossary" text="Daftar Istilah"/>
-<gentext key="glossary" text="Daftar Istilah"/>
 <gentext key="IMPORTANT" text="PENTING"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Penting"/>
 <gentext key="important" text="Penting"/>
 <gentext key="Index" text="Indeks"/>
 <gentext key="index" text="Indeks"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Aspek Hukum"/>
 <gentext key="legalnotice" text="Aspek Hukum"/>
 <gentext key="MsgAud" text="Pemirsa"/>
@@ -64,9 +66,9 @@
 <gentext key="msglevel" text="Tingkatan"/>
 <gentext key="MsgOrig" text="Asal"/>
 <gentext key="msgorig" text="Asal"/>
+<gentext key="note" text="Catatan"/>
 <gentext key="NOTE" text="CATATAN"/>
 <gentext key="Note" text="Catatan"/>
-<gentext key="note" text="Catatan"/>
 <gentext key="Part" text="Bagian"/>
 <gentext key="part" text="Bagian"/>
 <gentext key="Preface" text="Kata Pengantar"/>
@@ -87,77 +89,75 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Sinopsis"/>
 <gentext key="refsynopsisdiv" text="Sinopsis"/>
-<gentext key="Revision" text="Revisi"/>
-<gentext key="revision" text="Revisi"/>
 <gentext key="RevHistory" text="Catatan Revisi"/>
 <gentext key="revhistory" text="Catatan Revisi"/>
+<gentext key="Revision" text="Revisi"/>
+<gentext key="revision" text="Revisi"/>
 <gentext key="Section" text="Bagian"/>
-<gentext key="See" text="Lihat"/>
+<gentext key="section" text="bagian"/>
 <gentext key="see" text="Lihat"/>
-<gentext key="SeeAlso" text="Lihat Juga"/>
+<gentext key="See" text="Lihat"/>
+<gentext key="Seealso" text="Lihat juga"/>
 <gentext key="seealso" text="Lihat Juga"/>
-<gentext key="Set" text="Set"/>
+<gentext key="SeeAlso" text="Lihat Juga"/>
 <gentext key="set" text="Set"/>
+<gentext key="Set" text="Set"/>
 <gentext key="SetIndex" text="Set Index"/>
 <gentext key="setindex" text="Set Index"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="sidebar"/>
+<gentext key="step" text="tahap"/>
 <gentext key="Step" text="Tahap"/>
-<gentext key="TIP" text="TIP"/>
-<gentext key="Table" text="Tabel"/>
 <gentext key="table" text="Tabel"/>
+<gentext key="Table" text="Tabel"/>
+<gentext key="TIP" text="TIP"/>
 <gentext key="Tip" text="Tip"/>
 <gentext key="tip" text="Tip"/>
 <gentext key="WARNING" text="AWAS"/>
 <gentext key="Warning" text="Awas"/>
 <gentext key="warning" text="Awas"/>
-<gentext key="appendix" text="lampiran"/>
-<gentext key="chapter" text="bab"/>
-<gentext key="section" text="bagian"/>
-<gentext key="sidebar" text="sidebar"/>
-<gentext key="step" text="tahap"/>
-<gentext key="Seealso" text="Lihat juga"/>
 
-<gentext key="TableofContents" text="Daftar Isi"/>
-<gentext key="tableofcontents" text="Daftar Isi"/>
-<gentext key="in" text="di"/>
+<gentext key="and" text="dan"/>
 <gentext key="by" text="oleh"/>
 <gentext key="Edited" text="disunting"/>
 <gentext key="edited" text="disunting"/>
 <gentext key="Editedby" text="disunting oleh"/>
 <gentext key="editedby" text="disunting oleh"/>
-<gentext key="and" text="dan"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="di"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Catatan"/>
-<gentext key="notes" text="Catatan"/>
-<gentext key="TableNotes" text="Catatan"/>
-<gentext key="tablenotes" text="Catatan"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="elemen tak tampak"/>
+<gentext key="notes" text="Catatan"/>
+<gentext key="Notes" text="Catatan"/>
 <gentext key="Pgs" text="Hal."/>
 <gentext key="pgs" text="Hal."/>
-<gentext key="unsupported" text="tidak didukung"/>
-<gentext key="xrefto" text="xref ke"/>
-<gentext key="unexpectedelementname" text="Nama Elemen seharusnya tidak ada"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/>
+<gentext key="TableNotes" text="Catatan"/>
+<gentext key="tablenotes" text="Catatan"/>
+<gentext key="TableofContents" text="Daftar Isi"/>
+<gentext key="tableofcontents" text="Daftar Isi"/>
+<gentext key="unexpectedelementname" text="Nama Elemen seharusnya tidak ada"/>
+<gentext key="unsupported" text="tidak didukung"/>
+<gentext key="xrefto" text="xref ke"/>
 
-<gentext key="ListofTables" text="Daftar Tabel"/>
-<gentext key="listoftables" text="Daftar Tabel"/>
+<gentext key="listofequations" text="Daftar Persamaan"/>
+<gentext key="ListofEquations" text="Daftar Persamaan"/>
 <gentext key="ListofExamples" text="Daftar Teladan"/>
 <gentext key="listofexamples" text="Daftar Teladan"/>
 <gentext key="ListofFigures" text="Daftar Gambar"/>
 <gentext key="listoffigures" text="Daftar Gambar"/>
-<gentext key="ListofEquations" text="Daftar Persamaan"/>
-<gentext key="listofequations" text="Daftar Persamaan"/>
+<gentext key="listoftables" text="Daftar Tabel"/>
+<gentext key="ListofTables" text="Daftar Tabel"/>
 <gentext key="ListofUnknown" text="Daftar Gaib"/>
 <gentext key="listofunknown" text="Daftar Gaib"/>
 
+<gentext key="nav-home" text="Home"/>
+<gentext key="nav-next" text="Next"/>
+<gentext key="nav-next-sibling" text="Fast Forward"/>
 <gentext key="nav-prev" text="Prev"/>
 <gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
 <gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -353,9 +353,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/it.xml b/gentext/locale/it.xml
index 84f46f75f..24341327f 100644
--- a/gentext/locale/it.xml
+++ b/gentext/locale/it.xml
@@ -19,6 +19,7 @@
 <gentext key="Answer" text="R:"/>
 <gentext key="answer" text="R:"/>
 <gentext key="Appendix" text="Appendice"/>
+<gentext key="appendix" text="appendice"/>
 <gentext key="Article" text="Articolo"/>
 <gentext key="article" text="Articolo"/>
 <gentext key="Audience" text="Pubblico"/>
@@ -27,10 +28,11 @@
 <gentext key="bibliography" text="Bibliografia"/>
 <gentext key="Book" text="Libro"/>
 <gentext key="book" text="Libro"/>
-<gentext key="CAUTION" text="CAUTELA"/>
 <gentext key="Caution" text="Cautela"/>
 <gentext key="caution" text="Cautela"/>
+<gentext key="CAUTION" text="CAUTELA"/>
 <gentext key="Chapter" text="Capitolo"/>
+<gentext key="chapter" text="capitolo"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/>
 <gentext key="Copyright" text="Copyright"/>
@@ -45,19 +47,21 @@
 <gentext key="example" text="Esempio"/>
 <gentext key="Figure" text="Figura"/>
 <gentext key="figure" text="Figura"/>
+<gentext key="Glossary" text="Glossario"/>
+<gentext key="glossary" text="Glossario"/>
 <gentext key="GlossSee" text="Vedi"/>
 <gentext key="glosssee" text="Vedi"/>
-<gentext key="GlossSeeAlso" text="Vedi anche"/>
 <gentext key="glossseealso" text="Vedi anche"/>
-<gentext key="Glossary" text="Glossario"/>
-<gentext key="glossary" text="Glossario"/>
-<gentext key="IMPORTANT" text="IMPORTANTE"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
+<gentext key="GlossSeeAlso" text="Vedi anche"/>
+<gentext key="History" text="Diario"/>
+<gentext key="history" text="Diario"/>
 <gentext key="Important" text="Importante"/>
 <gentext key="important" text="Importante"/>
+<gentext key="IMPORTANT" text="IMPORTANTE"/>
 <gentext key="Index" text="Indice"/>
 <gentext key="index" text="Indice"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Note legali"/>
 <gentext key="legalnotice" text="Note legali"/>
 <gentext key="Level" text="Livello"/>
@@ -68,108 +72,104 @@
 <gentext key="msglevel" text="Livello"/>
 <gentext key="MsgOrig" text="Origine"/>
 <gentext key="msgorig" text="Origine"/>
-<gentext key="NOTE" text="NOTA"/>
-<gentext key="Name" text="Nome"/>
 <gentext key="name" text="Nome"/>
+<gentext key="Name" text="Nome"/>
 <gentext key="Note" text="Nota"/>
+<gentext key="NOTE" text="NOTA"/>
 <gentext key="note" text="Nota"/>
-<gentext key="Origin" text="Origine"/>
 <gentext key="origin" text="Origine"/>
+<gentext key="Origin" text="Origine"/>
 <gentext key="Part" text="Parte"/>
 <gentext key="part" text="Parte"/>
 <gentext key="Preface" text="Prefazione"/>
 <gentext key="preface" text="Prefazione"/>
-<gentext key="Procedure" text="Procedura"/>
 <gentext key="procedure" text="Procedura"/>
-<gentext key="Published" text="Pubblicato"/>
+<gentext key="Procedure" text="Procedura"/>
 <gentext key="published" text="Pubblicato"/>
+<gentext key="Published" text="Pubblicato"/>
 <gentext key="Question" text="D:"/>
 <gentext key="question" text="D:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/> <!-- en -->
-<gentext key="Reference" text="Riferimento"/>
 <gentext key="reference" text="Riferimento"/>
+<gentext key="Reference" text="Riferimento"/>
 <gentext key="RefName" text="Nome"/>
 <gentext key="refname" text="Nome"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/> <!-- en -->
 <gentext key="RefSynopsisDiv" text="Sinossi"/>
 <gentext key="refsynopsisdiv" text="Sinossi"/>
-<gentext key="Revision" text="Revisione"/>
-<gentext key="revision" text="Revisione"/>
 <gentext key="RevHistory" text="Diario delle revisioni"/>
 <gentext key="revhistory" text="Diario delle revisioni"/>
-<gentext key="History" text="Diario"/>
-<gentext key="history" text="Diario"/>
+<gentext key="Revision" text="Revisione"/>
+<gentext key="revision" text="Revisione"/>
 <gentext key="Section" text="Sezione"/>
+<gentext key="section" text="sezione"/>
 <gentext key="See" text="Vd."/>
 <gentext key="see" text="Vd."/>
-<gentext key="SeeAlso" text="Vd. Anche"/>
 <gentext key="seealso" text="Vd. Anche"/>
 <gentext key="Seealso" text="Vd. anche"/>
-<gentext key="Set" text="Raccolta"/>
+<gentext key="SeeAlso" text="Vd. Anche"/>
 <gentext key="set" text="Raccolta"/>
-<gentext key="SetIndex" text="Indice Raccolta"/>
+<gentext key="Set" text="Raccolta"/>
 <gentext key="setindex" text="Indice Raccolta"/>
-<gentext key="Sidebar" text="Nota a margine"/>
+<gentext key="SetIndex" text="Indice Raccolta"/>
 <gentext key="sidebar" text="nota a margine"/>
+<gentext key="Sidebar" text="Nota a margine"/>
 <gentext key="Step" text="Passaggio"/>
-<gentext key="TIP" text="SUGGERIMENTO"/>
-<gentext key="Table" text="Tabella"/>
+<gentext key="step" text="passaggio"/>
 <gentext key="table" text="Tabella"/>
+<gentext key="Table" text="Tabella"/>
+<gentext key="TIP" text="SUGGERIMENTO"/>
 <gentext key="Tip" text="Suggerimento"/>
 <gentext key="tip" text="Suggerimento"/>
-<gentext key="WARNING" text="ATTENZIONE"/>
 <gentext key="Warning" text="Attenzione"/>
 <gentext key="warning" text="Attenzione"/>
-<gentext key="appendix" text="appendice"/>
-<gentext key="chapter" text="capitolo"/>
-<gentext key="section" text="sezione"/>
-<gentext key="step" text="passaggio"/>
+<gentext key="WARNING" text="ATTENZIONE"/>
 
-<gentext key="TableofContents" text="Sommario"/>
-<gentext key="tableofcontents" text="Sommario"/>
-<gentext key="called" text="intitolato"/>
-<gentext key="in" text="in"/>
+<gentext key="and" text="e"/>
 <gentext key="by" text="di"/>
+<gentext key="called" text="intitolato"/>
 <gentext key="Edited" text="A cura"/>
 <gentext key="edited" text="A cura"/>
 <gentext key="Editedby" text="A cura di"/>
 <gentext key="editedby" text="A cura di"/>
-<gentext key="and" text="e"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="in"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Note"/>
+<gentext key="listcomma" text=","/>
+<gentext key="nonexistantelement" text="elemento non esistente"/>
 <gentext key="notes" text="Note"/>
+<gentext key="Notes" text="Note"/>
+<gentext key="Pgs" text="pp."/>
+<gentext key="pgs" text="pp."/>
+<gentext key="Revisedby" text="Corretto da: "/>
+<gentext key="revisedby" text="Corretto da: "/>
 <gentext key="TableNotes" text="Note"/>
 <gentext key="tablenotes" text="Note"/>
-<gentext key="nonexistantelement" text="elemento non esistente"/>
+<gentext key="TableofContents" text="Sommario"/>
+<gentext key="tableofcontents" text="Sommario"/>
 <gentext key="the" text="il"/>
-<gentext key="Pgs" text="pp."/>
-<gentext key="pgs" text="pp."/>
+<gentext key="unexpectedelementname" text="Nome elemento inaspettato"/>
 <gentext key="unsupported" text="non supportato"/>
 <gentext key="xrefto" text="riferimento a"/>
-<gentext key="unexpectedelementname" text="Nome elemento inaspettato"/>
-<gentext key="Revisedby" text="Corretto da: "/>
-<gentext key="revisedby" text="Corretto da: "/>
 
-<gentext key="ListofTables" text="Lista delle Tabelle"/>
-<gentext key="listoftables" text="Lista delle Tabelle"/>
+<gentext key="listofequations" text="Lista delle Equazioni"/>
+<gentext key="ListofEquations" text="Lista delle Equazioni"/>
 <gentext key="ListofExamples" text="Lista degli Esempi"/>
 <gentext key="listofexamples" text="Lista degli Esempi"/>
 <gentext key="ListofFigures" text="Lista delle Figure"/>
 <gentext key="listoffigures" text="Lista delle Figure"/>
-<gentext key="ListofEquations" text="Lista delle Equazioni"/>
-<gentext key="listofequations" text="Lista delle Equazioni"/>
+<gentext key="listoftables" text="Lista delle Tabelle"/>
+<gentext key="ListofTables" text="Lista delle Tabelle"/>
 <gentext key="ListofUnknown" text="Lista Sconosciuti"/>
 <gentext key="listofunknown" text="Lista Sconosciuti"/>
 
+<gentext key="nav-home" text="Partenza"/>
+<gentext key="nav-next" text="Avanti"/>
+<gentext key="nav-next-sibling" text="Salta avanti"/>
 <gentext key="nav-prev" text="Indietro"/>
 <gentext key="nav-prev-sibling" text="Salta indietro"/>
-<gentext key="nav-next-sibling" text="Salta avanti"/>
-<gentext key="nav-next" text="Avanti"/>
 <gentext key="nav-up" text="Risali"/>
-<gentext key="nav-home" text="Partenza"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -365,9 +365,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/ja.xml b/gentext/locale/ja.xml
index d19e98ef0..376bab926 100644
--- a/gentext/locale/ja.xml
+++ b/gentext/locale/ja.xml
@@ -21,17 +21,19 @@
 <gentext key="Answer" text="&#x554F;&#xFF1A;"/>
 <gentext key="answer" text="&#x554F;&#xFF1A;"/>
 <gentext key="Appendix" text="&#x4ED8;&#x9332;"/>
+<gentext key="appendix" text="&#x4ED8;&#x9332;"/>
 <gentext key="Article" text="&#x9805;&#x76EE;"/>
 <gentext key="article" text="&#x9805;&#x76EE;"/>
 <gentext key="Bibliography" text="&#x53C2;&#x8003;&#x6587;&#x732E;"/>
 <gentext key="bibliography" text="&#x53C2;&#x8003;&#x6587;&#x732E;"/>
 <gentext key="Book" text="&#x30D6;&#x30C3;&#x30AF;"/>
 <gentext key="book" text="&#x30D6;&#x30C3;&#x30AF;"/>
-<gentext key="CAUTION" text="&#x6CE8;&#x610F;"/>
 <gentext key="Caution" text="&#x6CE8;&#x610F;"/>
 <gentext key="caution" text="&#x6CE8;&#x610F;"/>
-<gentext key="Chapter1" text="&#x7B2C;"/>
+<gentext key="CAUTION" text="&#x6CE8;&#x610F;"/>
+<gentext key="chapter" text="&#x7AE0;"/>
 <gentext key="chapter1" text="&#x7B2C;"/>
+<gentext key="Chapter1" text="&#x7B2C;"/>
 <gentext key="Chapter2" text="&#x7AE0;"/>
 <gentext key="chapter2" text="&#x7AE0;"/>
 <gentext key="Colophon" text="&#x5965;&#x4ED8;"/>
@@ -48,19 +50,19 @@
 <gentext key="example" text="&#x4F8B;"/>
 <gentext key="Figure" text="&#x56F3;"/>
 <gentext key="figure" text="&#x56F3;"/>
+<gentext key="Glossary" text="&#x7528;&#x8A9E;&#x96C6;"/>
+<gentext key="glossary" text="&#x7528;&#x8A9E;&#x96C6;"/>
 <gentext key="GlossSee" text="&#x53C2;&#x7167;"/>
 <gentext key="glosssee" text="&#x53C2;&#x7167;"/>
 <gentext key="GlossSeeAlso" text="&#x53C2;&#x7167;"/>
 <gentext key="glossseealso" text="&#x53C2;&#x7167;"/>
-<gentext key="Glossary" text="&#x7528;&#x8A9E;&#x96C6;"/>
-<gentext key="glossary" text="&#x7528;&#x8A9E;&#x96C6;"/>
 <gentext key="IMPORTANT" text="&#x91CD;&#x8981;&#x9805;&#x76EE;"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="&#x91CD;&#x8981;&#x9805;&#x76EE;"/>
 <gentext key="important" text="&#x91CD;&#x8981;&#x9805;&#x76EE;"/>
 <gentext key="Index" text="&#x76EE;&#x6B21;"/>
 <gentext key="index" text="&#x76EE;&#x6B21;"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text=""/>
 <gentext key="legalnotice" text=""/>
 <gentext key="MsgAud" text="&#x5BFE;&#x8C61;&#x8005;"/>
@@ -69,9 +71,9 @@
 <gentext key="msglevel" text="&#x30EC;&#x30D9;&#x30EB;"/>
 <gentext key="MsgOrig" text="&#x767A;&#x4FE1;&#x5143;"/>
 <gentext key="msgorig" text="&#x767A;&#x4FE1;&#x5143;"/>
-<gentext key="NOTE" text="&#x6CE8;&#x610F;"/>
-<gentext key="Note" text="&#x6CE8;&#x610F;"/>
 <gentext key="note" text="&#x6CE8;&#x610F;"/>
+<gentext key="Note" text="&#x6CE8;&#x610F;"/>
+<gentext key="NOTE" text="&#x6CE8;&#x610F;"/>
 <gentext key="Part" text="&#x30D1;&#x30FC;&#x30C8;"/>
 <gentext key="part" text="&#x30D1;&#x30FC;&#x30C8;"/>
 <gentext key="Preface" text="&#x5E8F;&#x6587;"/>
@@ -84,85 +86,83 @@
 <gentext key="question" text="&#x7B54;&#xFF1A;"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="RefName" text="&#x540D;&#x524D;"/>
-<gentext key="refname" text="&#x540D;&#x524D;"/>
 <gentext key="Reference" text="&#x53C2;&#x7167;"/>
 <gentext key="reference" text="&#x53C2;&#x7167;"/>
+<gentext key="RefName" text="&#x540D;&#x524D;"/>
+<gentext key="refname" text="&#x540D;&#x524D;"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="&#x6982;&#x8981;"/>
 <gentext key="refsynopsisdiv" text="&#x6982;&#x8981;"/>
-<gentext key="Revision" text="&#x6539;&#x8A02;"/>
-<gentext key="revision" text="&#x6539;&#x8A02;"/>
 <gentext key="RevHistory" text="&#x6539;&#x8A02;&#x5C65;&#x6B74;"/>
 <gentext key="revhistory" text="&#x6539;&#x8A02;&#x5C65;&#x6B74;"/>
+<gentext key="revision" text="&#x6539;&#x8A02;"/>
+<gentext key="Revision" text="&#x6539;&#x8A02;"/>
 <gentext key="Section" text="&#x9805;"/>
+<gentext key="section" text="&#x9805;"/>
 <gentext key="See" text="&#x53C2;&#x7167;"/>
 <gentext key="see" text="&#x53C2;&#x7167;"/>
-<gentext key="SeeAlso" text="&#x53C2;&#x7167;"/>
 <gentext key="seealso" text="&#x53C2;&#x7167;"/>
+<gentext key="SeeAlso" text="&#x53C2;&#x7167;"/>
+<gentext key="Seealso" text="&#x53C2;&#x7167;"/>
 <gentext key="Set" text="&#x8A2D;&#x5B9A;"/>
 <gentext key="set" text="&#x8A2D;&#x5B9A;"/>
 <gentext key="SetIndex" text="&#x76EE;&#x6B21;&#x8A2D;&#x5B9A;"/>
 <gentext key="setindex" text="&#x76EE;&#x6B21;&#x8A2D;&#x5B9A;"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="&#x30B5;&#x30A4;&#x30C9;&#x30D0;&#x30FC;"/>
+<gentext key="step" text="&#x30B9;&#x30C6;&#x30C3;&#x30D7;"/>
 <gentext key="Step" text="&#x30B9;&#x30C6;&#x30C3;&#x30D7;"/>
-<gentext key="TIP" text="&#x30C6;&#x30A3;&#x30C3;&#x30D7;"/>
-<gentext key="Table" text="&#x8868;"/>
 <gentext key="table" text="&#x8868;"/>
+<gentext key="Table" text="&#x8868;"/>
+<gentext key="TIP" text="&#x30C6;&#x30A3;&#x30C3;&#x30D7;"/>
 <gentext key="Tip" text="&#x30C6;&#x30A3;&#x30C3;&#x30D7;"/>
 <gentext key="tip" text="&#x30C6;&#x30A3;&#x30C3;&#x30D7;"/>
 <gentext key="WARNING" text="&#x8B66;&#x544A;"/>
 <gentext key="Warning" text="&#x8B66;&#x544A;"/>
 <gentext key="warning" text="&#x8B66;&#x544A;"/>
-<gentext key="appendix" text="&#x4ED8;&#x9332;"/>
-<gentext key="chapter" text="&#x7AE0;"/>
-<gentext key="section" text="&#x9805;"/>
-<gentext key="sidebar" text="&#x30B5;&#x30A4;&#x30C9;&#x30D0;&#x30FC;"/>
-<gentext key="step" text="&#x30B9;&#x30C6;&#x30C3;&#x30D7;"/>
-<gentext key="Seealso" text="&#x53C2;&#x7167;"/>
 
-<gentext key="TableofContents" text="&#x76EE;&#x6B21;"/>
-<gentext key="tableofcontents" text="&#x76EE;&#x6B21;"/>
-<gentext key="in" text=""/>
+<gentext key="and" text="&#x3001;"/>
 <gentext key="by" text="&#xFF1A;"/>
 <gentext key="Edited" text="&#x4F5C;&#x8005;"/>
 <gentext key="edited" text="&#x4F5C;&#x8005;"/>
 <gentext key="Editedby" text="&#x4F5C;&#x8005;&#xFF1A;"/>
 <gentext key="editedby" text="&#x4F5C;&#x8005;&#xFF1A;"/>
-<gentext key="and" text="&#x3001;"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text=""/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="&#x6CE8;&#x610F;"/>
-<gentext key="notes" text="&#x6CE8;&#x610F;"/>
-<gentext key="TableNotes" text="&#x6CE8;&#x610F;"/>
-<gentext key="tablenotes" text="&#x6CE8;&#x610F;"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="&#x8981;&#x7D20;&#x304C;&#x5B58;&#x5728;&#x3057;&#x307E;&#x305B;&#x3093;"/>
+<gentext key="notes" text="&#x6CE8;&#x610F;"/>
+<gentext key="Notes" text="&#x6CE8;&#x610F;"/>
 <gentext key="Pgs" text="&#x5067;&#x732E;"/>
 <gentext key="pgs" text="&#x5067;&#x732E;"/>
-<gentext key="unsupported" text="&#x30B5;&#x30DD;&#x30FC;&#x30C8;&#x3057;&#x307E;&#x305B;&#x3093;"/>
-<gentext key="xrefto" text="xref to"/> <!-- en -->
-<gentext key="unexpectedelementname" text="&#x4E0D;&#x660E;&#x306A;&#x8981;&#x7D20;&#x540D;"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="&#x6CE8;&#x610F;"/>
+<gentext key="tablenotes" text="&#x6CE8;&#x610F;"/>
+<gentext key="TableofContents" text="&#x76EE;&#x6B21;"/>
+<gentext key="tableofcontents" text="&#x76EE;&#x6B21;"/>
+<gentext key="unexpectedelementname" text="&#x4E0D;&#x660E;&#x306A;&#x8981;&#x7D20;&#x540D;"/>
+<gentext key="unsupported" text="&#x30B5;&#x30DD;&#x30FC;&#x30C8;&#x3057;&#x307E;&#x305B;&#x3093;"/>
+<gentext key="xrefto" text="xref to"/> <!-- en -->
 
-<gentext key="ListofTables" text="&#x8868;&#x76EE;&#x6B21;"/>
-<gentext key="listoftables" text="&#x8868;&#x76EE;&#x6B21;"/>
+<gentext key="listofequations" text="&#x5F0F;&#x76EE;&#x6B21;"/>
+<gentext key="ListofEquations" text="&#x5F0F;&#x76EE;&#x6B21;"/>
 <gentext key="ListofExamples" text="&#x4F8B;&#x76EE;&#x6B21;"/>
 <gentext key="listofexamples" text="&#x4F8B;&#x76EE;&#x6B21;"/>
 <gentext key="ListofFigures" text="&#x56F3;&#x76EE;&#x6B21;"/>
 <gentext key="listoffigures" text="&#x56F3;&#x76EE;&#x6B21;"/>
-<gentext key="ListofEquations" text="&#x5F0F;&#x76EE;&#x6B21;"/>
-<gentext key="listofequations" text="&#x5F0F;&#x76EE;&#x6B21;"/>
+<gentext key="listoftables" text="&#x8868;&#x76EE;&#x6B21;"/>
+<gentext key="ListofTables" text="&#x8868;&#x76EE;&#x6B21;"/>
 <gentext key="ListofUnknown" text="&#x4E0D;&#x660E;&#x76EE;&#x6B21;"/>
 <gentext key="listofunknown" text="&#x4E0D;&#x660E;&#x76EE;&#x6B21;"/>
 
+<gentext key="nav-home" text="&#x30DB;&#x30FC;&#x30E0;"/>
+<gentext key="nav-next" text="&#x6B21;&#x306E;&#x30DA;&#x30FC;&#x30B8;"/>
+<gentext key="nav-next-sibling" text="Fast Forward"/>
 <gentext key="nav-prev" text="&#x524D;&#x306E;&#x30DA;&#x30FC;&#x30B8;"/>
 <gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="&#x6B21;&#x306E;&#x30DA;&#x30FC;&#x30B8;"/>
 <gentext key="nav-up" text="&#x4E0A;&#x306B;&#x623B;&#x308B;"/>
-<gentext key="nav-home" text="&#x30DB;&#x30FC;&#x30E0;"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -358,9 +358,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/ko.xml b/gentext/locale/ko.xml
index 00d4e9009..7c63042af 100644
--- a/gentext/locale/ko.xml
+++ b/gentext/locale/ko.xml
@@ -17,15 +17,17 @@
 <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;"/>
@@ -38,21 +40,21 @@
 <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="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="Glossary" text="&#xC6A9;&#xC5B4;&#xD574;&#xC124;"/>
-<gentext key="glossary" text="&#xC6A9;&#xC5B4;&#xD574;&#xC124;"/>
-<gentext key="IMPORTANT" text="[&#xC911;&#xC694;]"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <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="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;"/>
@@ -61,11 +63,11 @@
 <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="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;"/>
@@ -84,77 +86,75 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="&#xC694;&#xC57D;"/>
 <gentext key="refsynopsisdiv" text="&#xC694;&#xC57D;"/>
-<gentext key="Revision" text="&#xACE0;&#xCE68;"/>
-<gentext key="revision" text="&#xACE0;&#xCE68;"/>
 <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="Section" text="&#xC808;"/>
-<gentext key="See" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
+<gentext key="section" text="&#xC808;"/>
 <gentext key="see" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB0B4;&#xC6A9;"/>
-<gentext key="SeeAlso" text="[&#xC0B4;&#xD3B4;&#xBCFC; &#xB2E4;&#xB978; &#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="SetIndex" text="&#xC804;&#xC9D1; &#xC0C9;&#xC778;"/>
 <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="TIP" text="[&#xC791;&#xC740; &#xC815;&#xBCF4;]"/>
-<gentext key="Table" text="&#xD45C;"/>
 <gentext key="table" text="&#xD45C;"/>
-<gentext key="Tip" text="&#xC791;&#xC740; &#xC815;&#xBCF4;"/>
+<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="appendix" text="&#xBD80;&#xB85D;"/>
-<gentext key="chapter" text="&#xC7A5;"/>
-<gentext key="section" text="&#xC808;"/>
-<gentext key="sidebar" text="&#xB367;&#xBD99;&#xC784;"/>
-<gentext key="step" text="&#xB2E8;&#xACC4;"/>
-<gentext key="Seealso" text="&#xC0B4;&#xD3B4;&#xBCFC; &#xB2E4;&#xB978; &#xB0B4;&#xC6A9;"/>
 
-<gentext key="TableofContents" text="&#xCC28;&#xB840;"/>
-<gentext key="tableofcontents" text="&#xCC28;&#xB840;"/>
-<gentext key="in" text="-"/>
+<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="and" text="&#xADF8;&#xB9AC;&#xACE0;"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="-"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="&#xC8FC;&#xC11D;"/>
-<gentext key="notes" text="&#xC8FC;&#xC11D;"/>
-<gentext key="TableNotes" text="&#xCC38;&#xACE0;"/>
-<gentext key="tablenotes" text="&#xCC38;&#xACE0;"/>
+<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="Pgs" text="Pgs."/>
 <gentext key="pgs" text="Pgs."/>
-<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="unexpectedelementname" text="&#xC54C; &#xC218; &#xC5C6;&#xB294; &#xAE30;&#xCD08;&#xC694;&#xC18C; &#xC774;&#xB984;&#xC785;&#xB2C8;&#xB2E4;"/>
 <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="ListofTables" text="&#xD45C; &#xBAA9;&#xB85D;"/>
-<gentext key="listoftables" text="&#xD45C; &#xBAA9;&#xB85D;"/>
+<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="ListofEquations" text="&#xC218;&#xC2DD; &#xBAA9;&#xB85D;"/>
-<gentext key="listofequations" text="&#xC218;&#xC2DD; &#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-next-sibling" text="&#xB2E4;&#xC74C;&#xC73C;&#xB85C; &#xAC74;&#xB108;&#xB700;"/>
-<gentext key="nav-next" text="&#xB2E4;&#xC74C;"/>
 <gentext key="nav-up" text="&#xC704;&#xB85C;"/>
-<gentext key="nav-home" text="&#xCC98;&#xC74C;&#xC73C;&#xB85C;"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -350,9 +350,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/nl.xml b/gentext/locale/nl.xml
index 8bc6d3404..8500585d1 100644
--- a/gentext/locale/nl.xml
+++ b/gentext/locale/nl.xml
@@ -20,16 +20,18 @@
 <gentext key="Answer" text="Antwoord:"/>
 <gentext key="answer" text="Antwoord:"/>
 <gentext key="Appendix" text="Aanhangsel"/>
+<gentext key="appendix" text="aanhangsel"/>
 <gentext key="Article" text="Artikel"/>
 <gentext key="article" text="Artikel"/>
 <gentext key="Bibliography" text="Literatuurlijst"/>
 <gentext key="bibliography" text="Literatuurlijst"/>
 <gentext key="Book" text="Boek"/>
 <gentext key="book" text="Boek"/>
-<gentext key="CAUTION" text="LET OP"/>
 <gentext key="Caution" text="Let op"/>
 <gentext key="caution" text="Let op"/>
+<gentext key="CAUTION" text="LET OP"/>
 <gentext key="Chapter" text="Hoofdstuk"/>
+<gentext key="chapter" text="hoofdstuk"/>
 <gentext key="Colophon" text="Colofon"/>
 <gentext key="colophon" text="Colofon"/>
 <gentext key="Copyright" text="Copyright"/>
@@ -44,19 +46,19 @@
 <gentext key="example" text="Voorbeeld"/>
 <gentext key="Figure" text="Figuur"/>
 <gentext key="figure" text="Figuur"/>
+<gentext key="Glossary" text="Woordenlijst"/>
+<gentext key="glossary" text="Woordenlijst"/>
 <gentext key="GlossSee" text="Zie"/>
 <gentext key="glosssee" text="Zie"/>
 <gentext key="GlossSeeAlso" text="Zie ook"/>
 <gentext key="glossseealso" text="Zie ook"/>
-<gentext key="Glossary" text="Woordenlijst"/>
-<gentext key="glossary" text="Woordenlijst"/>
 <gentext key="IMPORTANT" text="BELANGRIJK"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Belangrijk"/>
 <gentext key="important" text="Belangrijk"/>
 <gentext key="Index" text="Register"/>
 <gentext key="index" text="Register"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Bericht"/>
 <gentext key="legalnotice" text="Bericht"/>
 <gentext key="MsgAud" text="Doelgroep"/>
@@ -65,9 +67,9 @@
 <gentext key="msglevel" text="Niveau"/>
 <gentext key="MsgOrig" text="Herkomst"/>
 <gentext key="msgorig" text="Herkomst"/>
+<gentext key="note" text="Opmerking"/>
 <gentext key="NOTE" text="OPMERKING"/>
 <gentext key="Note" text="Opmerking"/>
-<gentext key="note" text="Opmerking"/>
 <gentext key="Part" text="Deel"/>
 <gentext key="part" text="Deel"/>
 <gentext key="Preface" text="Voorwoord"/>
@@ -88,77 +90,75 @@
 <gentext key="refsection" text="Referentieparagraaf"/>
 <gentext key="RefSynopsisDiv" text="Referentiesamenvatting"/>
 <gentext key="refsynopsisdiv" text="Referentiesamenvatting"/>
-<gentext key="Revision" text="Herziening"/>
-<gentext key="revision" text="Herziening"/>
 <gentext key="RevHistory" text="Wijzigingen"/>
 <gentext key="revhistory" text="Wijzigingen"/>
+<gentext key="Revision" text="Herziening"/>
+<gentext key="revision" text="Herziening"/>
 <gentext key="Section" text="Paragraaf"/>
-<gentext key="See" text="Zie"/>
+<gentext key="section" text="paragraaf"/>
 <gentext key="see" text="Zie"/>
-<gentext key="SeeAlso" text="Zie ook"/>
+<gentext key="See" text="Zie"/>
+<gentext key="Seealso" text="Zie ook"/>
 <gentext key="seealso" text="Zie ook"/>
-<gentext key="Set" text="Verzameling"/>
+<gentext key="SeeAlso" text="Zie ook"/>
 <gentext key="set" text="Verzameling"/>
+<gentext key="Set" text="Verzameling"/>
 <gentext key="SetIndex" text="Hoofdregister"/>
 <gentext key="setindex" text="Hoofdregister"/>
 <gentext key="Sidebar" text="Excursie"/>
+<gentext key="sidebar" text="excursie"/>
+<gentext key="step" text="stap"/>
 <gentext key="Step" text="Stap"/>
-<gentext key="TIP" text="TIP"/>
-<gentext key="Table" text="Tabel"/>
 <gentext key="table" text="Tabel"/>
+<gentext key="Table" text="Tabel"/>
+<gentext key="TIP" text="TIP"/>
 <gentext key="Tip" text="Tip"/>
 <gentext key="tip" text="Tip"/>
 <gentext key="WARNING" text="WAARSCHUWING"/>
 <gentext key="Warning" text="Waarschuwing"/>
 <gentext key="warning" text="Waarschuwing"/>
-<gentext key="appendix" text="aanhangsel"/>
-<gentext key="chapter" text="hoofdstuk"/>
-<gentext key="section" text="paragraaf"/>
-<gentext key="sidebar" text="excursie"/>
-<gentext key="step" text="stap"/>
-<gentext key="Seealso" text="Zie ook"/>
 
-<gentext key="TableofContents" text="Inhoudsopgave"/>
-<gentext key="tableofcontents" text="Inhoudsopgave"/>
-<gentext key="in" text="in"/>
+<gentext key="and" text="en"/>
 <gentext key="by" text="door"/>
 <gentext key="Edited" text="Redactie"/>
 <gentext key="edited" text="Redactie"/>
 <gentext key="Editedby" text="Redactie door"/>
 <gentext key="editedby" text="Redactie door"/>
-<gentext key="and" text="en"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="in"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Noten"/>
-<gentext key="notes" text="Noten"/>
-<gentext key="TableNotes" text="Opmerkingen"/>
-<gentext key="tablenotes" text="Opmerkingen"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="niet bestaand element"/>
+<gentext key="notes" text="Noten"/>
+<gentext key="Notes" text="Noten"/>
 <gentext key="Pgs" text="blz."/>
 <gentext key="pgs" text="blz."/>
-<gentext key="unsupported" text="niet ondersteund"/>
-<gentext key="xrefto" text="verwijzing naar"/>
-<gentext key="unexpectedelementname" text="ONVERWACHT-ELEMENT"/>
 <gentext key="Revisedby" text="Herzien door: "/>
 <gentext key="revisedby" text="Herzien door: "/>
+<gentext key="TableNotes" text="Opmerkingen"/>
+<gentext key="tablenotes" text="Opmerkingen"/>
+<gentext key="TableofContents" text="Inhoudsopgave"/>
+<gentext key="tableofcontents" text="Inhoudsopgave"/>
+<gentext key="unexpectedelementname" text="ONVERWACHT-ELEMENT"/>
+<gentext key="unsupported" text="niet ondersteund"/>
+<gentext key="xrefto" text="verwijzing naar"/>
 
-<gentext key="ListofTables" text="Lijst van tabellen"/>
-<gentext key="listoftables" text="Lijst van tabellen"/>
+<gentext key="listofequations" text="Lijst van vergelijkingen"/>
+<gentext key="ListofEquations" text="Lijst van vergelijkingen"/>
 <gentext key="ListofExamples" text="Lijst van voorbeelden"/>
 <gentext key="listofexamples" text="Lijst van voorbeelden"/>
 <gentext key="ListofFigures" text="Lijst van figuren"/>
 <gentext key="listoffigures" text="Lijst van figuren"/>
-<gentext key="ListofEquations" text="Lijst van vergelijkingen"/>
-<gentext key="listofequations" text="Lijst van vergelijkingen"/>
+<gentext key="listoftables" text="Lijst van tabellen"/>
+<gentext key="ListofTables" text="Lijst van tabellen"/>
 <gentext key="ListofUnknown" text="Lijst van ???"/>
 <gentext key="listofunknown" text="Lijst van ???"/>
 
+<gentext key="nav-home" text="Begin"/>
+<gentext key="nav-next" text="Volgende"/>
+<gentext key="nav-next-sibling" text="Verder vooruit"/>
 <gentext key="nav-prev" text="Terug"/>
 <gentext key="nav-prev-sibling" text="Verder terug"/>
-<gentext key="nav-next-sibling" text="Verder vooruit"/>
-<gentext key="nav-next" text="Volgende"/>
 <gentext key="nav-up" text="Omhoog"/>
-<gentext key="nav-home" text="Begin"/>
 
 <gentext key="sectioncalled"       text="de sectie genaamd"/>
 
@@ -356,9 +356,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/no.xml b/gentext/locale/no.xml
index 5bd8abbb8..d7d7c67e8 100644
--- a/gentext/locale/no.xml
+++ b/gentext/locale/no.xml
@@ -24,16 +24,18 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/> <!-- en -->
 <gentext key="Appendix" text="Tillegg"/>
+<gentext key="appendix" text="Tillegg"/>
 <gentext key="Article" text=""/>
 <gentext key="article" text=""/>
 <gentext key="Bibliography" text="Bibliografi"/>
 <gentext key="bibliography" text="Bibliografi"/>
 <gentext key="Book" text=""/>
 <gentext key="book" text=""/>
-<gentext key="CAUTION" text="OBS"/>
 <gentext key="Caution" text="Obs"/>
 <gentext key="caution" text="Obs"/>
+<gentext key="CAUTION" text="OBS"/>
 <gentext key="Chapter" text="Kapittel"/>
+<gentext key="chapter" text="Kapittel"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
@@ -48,19 +50,19 @@
 <gentext key="example" text="Eksempel"/>
 <gentext key="Figure" text="Figur"/>
 <gentext key="figure" text="Figur"/>
+<gentext key="Glossary" text="Ordliste"/>
+<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="Glossary" text="Ordliste"/>
-<gentext key="glossary" text="Ordliste"/>
 <gentext key="IMPORTANT" text="VIKTIG"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Viktig"/>
 <gentext key="important" text="Viktig"/>
 <gentext key="Index" text="Indeks"/>
 <gentext key="index" text="Indeks"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text=""/>
 <gentext key="legalnotice" text=""/>
 <gentext key="MsgAud" text="Publikum"/>
@@ -69,9 +71,9 @@
 <gentext key="msglevel" text="Niv&aring;"/>
 <gentext key="MsgOrig" text="Opphav"/>
 <gentext key="msgorig" text="Opphav"/>
+<gentext key="note" text="Notat"/>
 <gentext key="NOTE" text="NOTAT"/>
 <gentext key="Note" text="Notat"/>
-<gentext key="note" text="Notat"/>
 <gentext key="Part" text="Del"/>
 <gentext key="part" text="Del"/>
 <gentext key="Preface" text="Forord"/>
@@ -84,85 +86,83 @@
 <gentext key="question" text="Q:"/> <!-- en -->
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="RefName" text="Navn"/>
-<gentext key="refname" text="Navn"/>
 <gentext key="Reference" text="Referanse"/>
 <gentext key="reference" text="Referanse"/>
+<gentext key="RefName" text="Navn"/>
+<gentext key="refname" text="Navn"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="Revision" text="Revisjon"/>
-<gentext key="revision" text="Revisjon"/>
 <gentext key="RevHistory" text="Revisjonshistorie"/>
 <gentext key="revhistory" text="Revisjonshistorie"/>
+<gentext key="Revision" text="Revisjon"/>
+<gentext key="revision" text="Revisjon"/>
 <gentext key="Section" text="Seksjon"/>
-<gentext key="See" text="Se"/>
+<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="Set" text=""/>
 <gentext key="set" text=""/>
+<gentext key="Set" text=""/>
 <gentext key="SetIndex" text="Indeks"/>
 <gentext key="setindex" text="Indeks"/>
-<gentext key="Sidebar" text=""/>
 <gentext key="sidebar" text=""/>
+<gentext key="Sidebar" text=""/>
+<gentext key="step" text="steg"/>
 <gentext key="Step" text="Steg"/>
-<gentext key="TIP" text="TIPS"/>
 <gentext key="Table" text="Tabell"/>
 <gentext key="table" text="Tabell"/>
-<gentext key="Tip" text="Tips"/>
 <gentext key="tip" text="Tips"/>
+<gentext key="TIP" text="TIPS"/>
+<gentext key="Tip" text="Tips"/>
+<gentext key="warning" text="Advarsel"/>
 <gentext key="WARNING" text="ADVARSEL"/>
 <gentext key="Warning" text="Advarsel"/>
-<gentext key="warning" text="Advarsel"/>
-<gentext key="appendix" text="Tillegg"/>
-<gentext key="chapter" text="Kapittel"/>
-<gentext key="section" text="seksjon"/>
-<gentext key="step" text="steg"/>
-<gentext key="Seealso" text="Se ogs&aring;"/>
 
-<gentext key="TableofContents" text="Innholdsfortegnelse"/>
-<gentext key="tableofcontents" text="Innholdsfortegnelse"/>
-<gentext key="in" text="i"/>
+<gentext key="and" text="og"/>
 <gentext key="by" text="av"/>
 <gentext key="Edited" text="Redigert"/>
 <gentext key="edited" text="Redigert"/>
 <gentext key="Editedby" text="Redigert av"/>
 <gentext key="editedby" text="Redigert av"/>
-<gentext key="and" text="og"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="i"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Sluttnotater"/>
-<gentext key="notes" text="Sluttnotater"/>
-<gentext key="TableNotes" text="Notater"/>
-<gentext key="tablenotes" text="Notater"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="ikke-eksisterende element"/>
+<gentext key="notes" text="Sluttnotater"/>
+<gentext key="Notes" text="Sluttnotater"/>
 <gentext key="Pgs" text="Sdr."/>
 <gentext key="pgs" text="Sdr."/>
-<gentext key="unsupported" text="ikke st&oslash;ttet"/>
-<gentext key="xrefto" text="xref til"/>
-<gentext key="unexpectedelementname" text="UVENTET-ELEMENTNAVN"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="Notater"/>
+<gentext key="tablenotes" text="Notater"/>
+<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="xrefto" text="xref til"/>
 
-<gentext key="ListofTables" text="Tabelloversikt"/>
-<gentext key="listoftables" text="Tabelloversikt"/>
+<gentext key="listofequations" text="Formeloversikt"/>
+<gentext key="ListofEquations" text="Formeloversikt"/>
 <gentext key="ListofExamples" text="Eksempeloversikt"/>
 <gentext key="listofexamples" text="Eksempeloversikt"/>
 <gentext key="ListofFigures" text="Figuroversikt"/>
 <gentext key="listoffigures" text="Figuroversikt"/>
-<gentext key="ListofEquations" text="Formeloversikt"/>
-<gentext key="listofequations" text="Formeloversikt"/>
+<gentext key="listoftables" text="Tabelloversikt"/>
+<gentext key="ListofTables" text="Tabelloversikt"/>
 <gentext key="ListofUnknown" text="???-oversikt"/>
 <gentext key="listofunknown" text="???-oversikt"/>
 
+<gentext key="nav-home" text="Hjem"/>
+<gentext key="nav-next" text="Neste"/>
+<gentext key="nav-next-sibling" text="Raskt Fremover"/>
 <gentext key="nav-prev" text="Forrige"/>
 <gentext key="nav-prev-sibling" text="Raskt Bakover"/>
-<gentext key="nav-next-sibling" text="Raskt Fremover"/>
-<gentext key="nav-next" text="Neste"/>
 <gentext key="nav-up" text="Opp"/>
-<gentext key="nav-home" text="Hjem"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -358,9 +358,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/pl.xml b/gentext/locale/pl.xml
index df197677f..5e4b2a76d 100644
--- a/gentext/locale/pl.xml
+++ b/gentext/locale/pl.xml
@@ -109,45 +109,45 @@
 <gentext key="Warning" text="Ostrze&#191;enie"/>
 <gentext key="warning" text="Ostrze&#191;enie"/>
 
-<gentext key="TableofContents" text="Spis tre&#347;ci"/>
-<gentext key="tableofcontents" text="Spis tre&#347;ci"/>
-<gentext key="in" text="w"/>
+<gentext key="and" text="i"/>
 <gentext key="by" text=""/>
 <gentext key="Editedby" text="Redakcja: "/>
 <gentext key="editedby" text="Redakcja: "/>
-<gentext key="and" text="i"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="w"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Przypisy"/>
-<gentext key="notes" text="Przypisy"/>
-<gentext key="TableNotes" text="Przypisy"/>
-<gentext key="tablenotes" text="Przypisy"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="nie istniej&#261;cy element"/>
+<gentext key="notes" text="Przypisy"/>
+<gentext key="Notes" text="Przypisy"/>
 <gentext key="Pgs" text="stron"/>
 <gentext key="pgs" text="stron"/>
-<gentext key="unsupported" text="nie wspierany"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
 <gentext key="Revisedby" text="Revised by: "/> <!-- en -->
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="Przypisy"/>
+<gentext key="tablenotes" text="Przypisy"/>
+<gentext key="TableofContents" text="Spis tre&#347;ci"/>
+<gentext key="tableofcontents" text="Spis tre&#347;ci"/>
+<gentext key="unexpectedelementname" text="Unexpected element name"/>
+<gentext key="unsupported" text="nie wspierany"/>
+<gentext key="xrefto" text="xref to"/>
 
-<gentext key="ListofTables" text="Spis tabel"/>
-<gentext key="listoftables" text="Spis tabel"/>
+<gentext key="listofequations" text="Spis r&#243;wna&#324;"/>
+<gentext key="ListofEquations" text="Spis r&#243;wna&#324;"/>
 <gentext key="ListofExamples" text="Spis przyk&#322;ad&#243;w"/>
 <gentext key="listofexamples" text="Spis przyk&#322;ad&#243;w"/>
 <gentext key="ListofFigures" text="Spis rysunk&#243;w"/>
 <gentext key="listoffigures" text="Spis rysunk&#243;w"/>
-<gentext key="ListofEquations" text="Spis r&#243;wna&#324;"/>
-<gentext key="listofequations" text="Spis r&#243;wna&#324;"/>
+<gentext key="listoftables" text="Spis tabel"/>
+<gentext key="ListofTables" text="Spis tabel"/>
 <gentext key="ListofUnknown" text="Spis ???"/>
 <gentext key="listofunknown" text="Spis ???"/>
 
+<gentext key="nav-home" text="Spis tre&#347;ci"/>
+<gentext key="nav-next" text="Nast&#234;pny"/>
+<gentext key="nav-next-sibling" text="Nast&#281;pny rozdzia&#322;"/>
 <gentext key="nav-prev" text="Poprzedni"/>
 <gentext key="nav-prev-sibling" text="Poprzedni rozdzia&#322;"/>
-<gentext key="nav-next-sibling" text="Nast&#281;pny rozdzia&#322;"/>
-<gentext key="nav-next" text="Nast&#234;pny"/>
 <gentext key="nav-up" text="Pocz&#261;tek rozdzia&#322;u"/>
-<gentext key="nav-home" text="Spis tre&#347;ci"/>
 
 <dingbat key="startquote" text="&#x201E;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -343,9 +343,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/pt.xml b/gentext/locale/pt.xml
index 984446f91..70123af3f 100644
--- a/gentext/locale/pt.xml
+++ b/gentext/locale/pt.xml
@@ -19,16 +19,18 @@
 <gentext key="Answer" text="R:"/>
 <gentext key="answer" text="R:"/>
 <gentext key="Appendix" text="Ap&#234;ndice"/>
+<gentext key="appendix" text="ap&#234;ndice"/>
 <gentext key="Article" text="Artigo"/>
 <gentext key="article" text="Artigo"/>
 <gentext key="Bibliography" text="Bibliografia"/>
 <gentext key="bibliography" text="Bibliografia"/>
 <gentext key="Book" text="Livro"/>
 <gentext key="book" text="Livro"/>
-<gentext key="CAUTION" text="CAUTELA"/>
 <gentext key="Caution" text="Cautela"/>
 <gentext key="caution" text="Cautela"/>
+<gentext key="CAUTION" text="CAUTELA"/>
 <gentext key="Chapter" text="Cap&#237;tulo"/>
+<gentext key="chapter" text="cap&#237;tulo"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Exemplo"/>
 <gentext key="Figure" text="Figura"/>
 <gentext key="figure" text="Figura"/>
+<gentext key="Glossary" text="Glossario"/>
+<gentext key="glossary" text="Glossario"/>
 <gentext key="GlossSee" text="Ver"/>
 <gentext key="glosssee" text="Ver"/>
 <gentext key="GlossSeeAlso" text="Ver Tamb&#233;m"/>
 <gentext key="glossseealso" text="Ver Tamb&#233;m"/>
-<gentext key="Glossary" text="Glossario"/>
-<gentext key="glossary" text="Glossario"/>
 <gentext key="IMPORTANT" text="IMPORTANTE"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Importante"/>
 <gentext key="important" text="Importante"/>
 <gentext key="Index" text="Index"/>
 <gentext key="index" text="Index"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text=""/>
 <gentext key="legalnotice" text=""/>
 <gentext key="MsgAud" text="Audi&#234;ncia"/>
@@ -64,9 +66,9 @@
 <gentext key="msglevel" text="N&#237;vel"/>
 <gentext key="MsgOrig" text="Origem"/>
 <gentext key="msgorig" text="Origem"/>
+<gentext key="note" text="Nota"/>
 <gentext key="NOTE" text="NOTA"/>
 <gentext key="Note" text="Nota"/>
-<gentext key="note" text="Nota"/>
 <gentext key="Part" text="Parte"/>
 <gentext key="part" text="Parte"/>
 <gentext key="Preface" text="Pref&#225;cio"/>
@@ -81,85 +83,83 @@
 <gentext key="question" text="P:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="RefName" text="Nome"/>
-<gentext key="refname" text="Nome"/>
 <gentext key="Reference" text="Refer&#234;ncia"/>
 <gentext key="reference" text="Refer&#234;ncia"/>
+<gentext key="RefName" text="Nome"/>
+<gentext key="refname" text="Nome"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="Revision" text="Revis&#227;o"/>
-<gentext key="revision" text="Revis&#227;o"/>
 <gentext key="RevHistory" text="Hitorial de Revis&#245;es"/>
 <gentext key="revhistory" text="Hitorial de Revis&#245;es"/>
+<gentext key="Revision" text="Revis&#227;o"/>
+<gentext key="revision" text="Revis&#227;o"/>
 <gentext key="Section" text="Sec&#231;&#227;o"/>
-<gentext key="See" text="Ver"/>
+<gentext key="section" text="sec&#231;&#227;o"/>
 <gentext key="see" text="Ver"/>
-<gentext key="SeeAlso" text="Ver Tamb&#233;m"/>
+<gentext key="See" text="Ver"/>
 <gentext key="seealso" text="Ver Tamb&#233;m"/>
+<gentext key="SeeAlso" text="Ver Tamb&#233;m"/>
+<gentext key="Seealso" text="ver tamb&#233;m"/>
 <gentext key="Set" text="Set"/>
 <gentext key="set" text="Set"/> <!--usen-->
 <gentext key="SetIndex" text="Set Index"/>
 <gentext key="setindex" text="Set Index"/> <!--usen-->
 <gentext key="Sidebar" text="Sidebar"/> <!--usen-->
 <gentext key="sidebar" text="sidebar"/> <!--usen-->
+<gentext key="step" text="passo"/>
 <gentext key="Step" text="Passo"/>
-<gentext key="TIP" text="DICA"/>
 <gentext key="Table" text="Tabela"/>
 <gentext key="table" text="Tabela"/>
+<gentext key="TIP" text="DICA"/>
 <gentext key="Tip" text="Dica"/>
 <gentext key="tip" text="Dica"/>
 <gentext key="WARNING" text="ATEN&#199;&#195;O"/>
-<gentext key="Warning" text="Aten&#231;&#227;o"/>
 <gentext key="warning" text="Aten&#231;&#227;o"/>
-<gentext key="appendix" text="ap&#234;ndice"/>
-<gentext key="chapter" text="cap&#237;tulo"/>
-<gentext key="section" text="sec&#231;&#227;o"/>
-<gentext key="step" text="passo"/>
-<gentext key="Seealso" text="ver tamb&#233;m"/>
+<gentext key="Warning" text="Aten&#231;&#227;o"/>
 
-<gentext key="TableofContents" text="&#205;ndice"/>
-<gentext key="tableofcontents" text="&#205;ndice"/>
-<gentext key="in" text=""/>
+<gentext key="and" text="e"/>
 <gentext key="by" text="por"/>
 <gentext key="Edited" text="Editado"/>
 <gentext key="edited" text="Editado"/>
 <gentext key="Editedby" text="Editado por"/>
 <gentext key="editedby" text="Editado por"/>
-<gentext key="and" text="e"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text=""/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notas"/>
-<gentext key="notes" text="Notas"/>
-<gentext key="TableNotes" text="Notas"/>
-<gentext key="tablenotes" text="Notas"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="non-existant element"/>
+<gentext key="notes" text="Notas"/>
+<gentext key="Notes" text="Notas"/>
 <gentext key="Pgs" text="P&#225;ginas"/>
 <gentext key="pgs" text="P&#225;ginas"/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="Notas"/>
+<gentext key="tablenotes" text="Notas"/>
+<gentext key="TableofContents" text="&#205;ndice"/>
+<gentext key="tableofcontents" text="&#205;ndice"/>
+<gentext key="unexpectedelementname" text="Unexpected element name"/>
+<gentext key="unsupported" text="unsupported"/>
+<gentext key="xrefto" text="xref to"/>
 
-<gentext key="ListofTables" text="Lista de Tabelas"/>
-<gentext key="listoftables" text="Lista de Tabelas"/>
+<gentext key="listofequations" text="Lista de Equa&#231;&#245;es"/>
+<gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
 <gentext key="ListofExamples" text="Lista de Exemplos"/>
 <gentext key="listofexamples" text="Lista de Exemplos"/>
 <gentext key="ListofFigures" text="Lista de Figuras"/>
 <gentext key="listoffigures" text="Lista de Figuras"/>
-<gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
-<gentext key="listofequations" text="Lista de Equa&#231;&#245;es"/>
+<gentext key="listoftables" text="Lista de Tabelas"/>
+<gentext key="ListofTables" text="Lista de Tabelas"/>
 <gentext key="ListofUnknown" text="List of ???"/>
 <gentext key="listofunknown" text="List of ???"/>
 
+<gentext key="nav-home" text="Home"/>
+<gentext key="nav-next" text="Next"/>
+<gentext key="nav-next-sibling" text="Fast Forward"/>
 <gentext key="nav-prev" text="Prev"/>
 <gentext key="nav-prev-sibling" text="Fast Backward"/>
-<gentext key="nav-next-sibling" text="Fast Forward"/>
-<gentext key="nav-next" text="Next"/>
 <gentext key="nav-up" text="Up"/>
-<gentext key="nav-home" text="Home"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -212,6 +212,7 @@
 <template name="procedure">%t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaset">%t</template>
+<template name="question">Pergunta %n</template>
 <template name="reference">%t</template>
 <template name="refsect1">%t</template>
 <template name="refsect2">%t</template>
@@ -228,7 +229,6 @@
 <template name="toc">%t</template>
 <template name="variablelist">%t</template>
 <template name="warning">%t</template>
-<template name="question">Pergunta %n</template>
 
 </context>
 
@@ -356,9 +356,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/pt_br.xml b/gentext/locale/pt_br.xml
index d8ea00bef..2799a9c29 100644
--- a/gentext/locale/pt_br.xml
+++ b/gentext/locale/pt_br.xml
@@ -19,16 +19,18 @@
 <gentext key="Answer" text="R:"/>
 <gentext key="answer" text="R:"/>
 <gentext key="Appendix" text="Ap&#234;ndice"/>
+<gentext key="appendix" text="ap&#234;ndice"/>
 <gentext key="Article" text="Artigo"/>
 <gentext key="article" text="Artigo"/>
 <gentext key="Bibliography" text="Bibliografia"/>
 <gentext key="bibliography" text="Bibliografia"/>
 <gentext key="Book" text="Livro"/>
 <gentext key="book" text="Livro"/>
-<gentext key="CAUTION" text="CUIDADO"/>
 <gentext key="Caution" text="Cuidado"/>
 <gentext key="caution" text="Cuidado"/>
+<gentext key="CAUTION" text="CUIDADO"/>
 <gentext key="Chapter" text="Cap&#237;tulo"/>
+<gentext key="chapter" text="cap&#237;tulo"/>
 <gentext key="Colophon" text="Considera&#231;&#245;es finais"/>
 <gentext key="colophon" text="Considera&#231;&#245;es finais"/>
 <gentext key="Copyright" text="Copyright"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Exemplo"/>
 <gentext key="Figure" text="Figura"/>
 <gentext key="figure" text="Figura"/>
+<gentext key="Glossary" text="Gloss&#225;rio"/>
+<gentext key="glossary" text="Gloss&#225;rio"/>
 <gentext key="GlossSee" text="Ver"/>
 <gentext key="glosssee" text="Ver"/>
 <gentext key="GlossSeeAlso" text="Ver Tamb&#233;m"/>
 <gentext key="glossseealso" text="Ver Tamb&#233;m"/>
-<gentext key="Glossary" text="Gloss&#225;rio"/>
-<gentext key="glossary" text="Gloss&#225;rio"/>
 <gentext key="IMPORTANT" text="IMPORTANTE"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Importante"/>
 <gentext key="important" text="Importante"/>
 <gentext key="Index" text="&#205;ndice Remissivo"/>
 <gentext key="index" text="&#205;ndice Remissivo"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Nota Legal"/>
 <gentext key="legalnotice" text="Nota Legal"/>
 <gentext key="MsgAud" text="Audi&#234;ncia"/>
@@ -64,9 +66,9 @@
 <gentext key="msglevel" text="N&#237;vel"/>
 <gentext key="MsgOrig" text="Origem"/>
 <gentext key="msgorig" text="Origem"/>
+<gentext key="note" text="Nota"/>
 <gentext key="NOTE" text="NOTA"/>
 <gentext key="Note" text="Nota"/>
-<gentext key="note" text="Nota"/>
 <gentext key="Part" text="Parte"/>
 <gentext key="part" text="Parte"/>
 <gentext key="Preface" text="Pref&#225;cio"/>
@@ -81,85 +83,83 @@
 <gentext key="question" text="P:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="RefName" text="Nome"/>
-<gentext key="refname" text="Nome"/>
 <gentext key="Reference" text="Refer&#234;ncia"/>
 <gentext key="reference" text="Refer&#234;ncia"/>
+<gentext key="RefName" text="Nome"/>
+<gentext key="refname" text="Nome"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Sinopse"/>
 <gentext key="refsynopsisdiv" text="Sinopse"/>
-<gentext key="Revision" text="Revis&#227;o"/>
-<gentext key="revision" text="Revis&#227;o"/>
 <gentext key="RevHistory" text="Hist&#243;rico de Revis&#245;es"/>
 <gentext key="revhistory" text="Hist&#243;rico de Revis&#245;es"/>
+<gentext key="Revision" text="Revis&#227;o"/>
+<gentext key="revision" text="Revis&#227;o"/>
 <gentext key="Section" text="Se&#231;&#227;o"/>
-<gentext key="See" text="Ver"/>
+<gentext key="section" text="se&#231;&#227;o"/>
 <gentext key="see" text="Ver"/>
-<gentext key="SeeAlso" text="Ver Tamb&#233;m"/>
+<gentext key="See" text="Ver"/>
 <gentext key="seealso" text="Ver Tamb&#233;m"/>
+<gentext key="SeeAlso" text="Ver Tamb&#233;m"/>
+<gentext key="Seealso" text="ver tamb&#233;m"/>
 <gentext key="Set" text="Conjunto"/>
 <gentext key="set" text="Conjunto"/>
 <gentext key="SetIndex" text="&#205;ndice do Conjunto"/>
 <gentext key="setindex" text="&#205;ndice do Conjunto"/>
 <gentext key="Sidebar" text="Quadro Lateral"/>
 <gentext key="sidebar" text="quadro lateral"/>
+<gentext key="step" text="passo"/>
 <gentext key="Step" text="Passo"/>
-<gentext key="TIP" text="DICA"/>
 <gentext key="Table" text="Tabela"/>
 <gentext key="table" text="Tabela"/>
+<gentext key="TIP" text="DICA"/>
 <gentext key="Tip" text="Dica"/>
 <gentext key="tip" text="Dica"/>
 <gentext key="WARNING" text="ATEN&#199;&#195;O"/>
-<gentext key="Warning" text="Aten&#231;&#227;o"/>
 <gentext key="warning" text="Aten&#231;&#227;o"/>
-<gentext key="appendix" text="ap&#234;ndice"/>
-<gentext key="chapter" text="cap&#237;tulo"/>
-<gentext key="section" text="se&#231;&#227;o"/>
-<gentext key="step" text="passo"/>
-<gentext key="Seealso" text="ver tamb&#233;m"/>
+<gentext key="Warning" text="Aten&#231;&#227;o"/>
 
-<gentext key="TableofContents" text="&#205;ndice"/>
-<gentext key="tableofcontents" text="&#205;ndice"/>
-<gentext key="in" text=""/>
+<gentext key="and" text="e"/>
 <gentext key="by" text="por"/>
-<gentext key="Edited" text="Editado"/>
 <gentext key="edited" text="Editado"/>
-<gentext key="Editedby" text="Editado por"/>
+<gentext key="Edited" text="Editado"/>
 <gentext key="editedby" text="Editado por"/>
-<gentext key="Revisedby" text="Revisado por: "/>
-<gentext key="revisedby" text="Revisado por: "/>
-<gentext key="and" text="e"/>
-<gentext key="listcomma" text=","/>
+<gentext key="Editedby" text="Editado por"/>
+<gentext key="in" text=""/>
 <gentext key="lastlistcomma" text=","/>
+<gentext key="listcomma" text=","/>
+<gentext key="nonexistantelement" text="elemento inexistente"/>
 <gentext key="Notes" text="Notas"/>
 <gentext key="notes" text="Notas"/>
-<gentext key="TableNotes" text="Notas"/>
-<gentext key="tablenotes" text="Notas"/>
-<gentext key="nonexistantelement" text="elemento inexistente"/>
 <gentext key="Pgs" text="P&#225;ginas"/>
 <gentext key="pgs" text="P&#225;ginas"/>
+<gentext key="Revisedby" text="Revisado por: "/>
+<gentext key="revisedby" text="Revisado por: "/>
+<gentext key="tablenotes" text="Notas"/>
+<gentext key="TableNotes" text="Notas"/>
+<gentext key="TableofContents" text="&#205;ndice"/>
+<gentext key="tableofcontents" text="&#205;ndice"/>
+<gentext key="unexpectedelementname" text="Nome de elemento inesperado"/>
 <gentext key="unsupported" text="n&#227;o suportado"/>
 <gentext key="xrefto" text="refer&#234;ncia para"/>
-<gentext key="unexpectedelementname" text="Nome de elemento inesperado"/>
 
-<gentext key="ListofTables" text="Lista de Tabelas"/>
-<gentext key="listoftables" text="Lista de Tabelas"/>
+<gentext key="listofequations" text="Lista de Equa&#231;&#245;es"/>
+<gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
 <gentext key="ListofExamples" text="Lista de Exemplos"/>
 <gentext key="listofexamples" text="Lista de Exemplos"/>
 <gentext key="ListofFigures" text="Lista de Figuras"/>
 <gentext key="listoffigures" text="Lista de Figuras"/>
-<gentext key="ListofEquations" text="Lista de Equa&#231;&#245;es"/>
-<gentext key="listofequations" text="Lista de Equa&#231;&#245;es"/>
+<gentext key="listoftables" text="Lista de Tabelas"/>
+<gentext key="ListofTables" text="Lista de Tabelas"/>
 <gentext key="ListofUnknown" text="Lista de ???"/>
 <gentext key="listofunknown" text="Lista de ???"/>
 
+<gentext key="nav-home" text="Principal"/>
+<gentext key="nav-next" text="Pr&#243;xima"/>
+<gentext key="nav-next-sibling" text="Fim"/>
 <gentext key="nav-prev" text="Anterior"/>
 <gentext key="nav-prev-sibling" text="In&#237;cio"/>
-<gentext key="nav-next-sibling" text="Fim"/>
-<gentext key="nav-next" text="Pr&#243;xima"/>
 <gentext key="nav-up" text="Acima"/>
-<gentext key="nav-home" text="Principal"/>
 
 <dingbat key="startquote"		text="&#x201C;"/>
 <dingbat key="endquote"			text="&#x201D;"/>
@@ -355,9 +355,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/ro.xml b/gentext/locale/ro.xml
index 4a44f7460..d1cfd2086 100644
--- a/gentext/locale/ro.xml
+++ b/gentext/locale/ro.xml
@@ -27,6 +27,7 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/> <!-- en -->
 <gentext key="Appendix" text="Anexa"/>
+<gentext key="appendix" text="anexa"/>
 <gentext key="Article" text="Articol"/>
 <gentext key="article" text="Articol"/>
 <gentext key="Bibliography" text="Bibliografie"/>
@@ -34,9 +35,10 @@
 <gentext key="Book" text="Carte"/>
 <gentext key="book" text="Carte"/>
 <gentext key="CAUTION" text="ATEN&#222;IE"/>
-<gentext key="Caution" text="Aten&#254;ie"/>
 <gentext key="caution" text="Aten&#254;ie"/>
+<gentext key="Caution" text="Aten&#254;ie"/>
 <gentext key="Chapter" text="Cap."/>
+<gentext key="chapter" text="cap."/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
@@ -58,12 +60,12 @@
 <gentext key="GlossSeeAlso" text="Vezi &scedil;i"/>
 <gentext key="glossseealso" text="Vezi &scedil;i"/>
 <gentext key="IMPORTANT" text="IMPORTANT"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Important"/>
 <gentext key="important" text="Important"/>
 <gentext key="Index" text="Index"/>
 <gentext key="index" text="Index"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text=""/>
 <gentext key="legalnotice" text=""/>
 <gentext key="MsgAud" text=""/>
@@ -73,10 +75,8 @@
 <gentext key="MsgOrig" text="Origine"/>
 <gentext key="msgorig" text="Origine"/>
 <gentext key="NOTE" text="NOT&#195;"/>
-<gentext key="Note" text="Not&#227;"/>
 <gentext key="note" text="Not&#227;"/>
-<gentext key="RefName" text="Nume"/>
-<gentext key="refname" text="Nume"/>
+<gentext key="Note" text="Not&#227;"/>
 <gentext key="Part" text="Parte"/>
 <gentext key="part" text="Parte"/>
 <gentext key="Preface" text="Prefa&#254;&#227;"/>
@@ -91,81 +91,81 @@
 <gentext key="refentry" text=""/>
 <gentext key="Reference" text="Referin&#254;&#227;"/>
 <gentext key="reference" text="Referin&#254;&#227;"/>
+<gentext key="refname" text="Nume"/>
+<gentext key="RefName" text="Nume"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Rezumat"/>
 <gentext key="refsynopsisdiv" text="Rezumat"/>
-<gentext key="Revision" text="Versiune"/>
-<gentext key="revision" text="Versiune"/>
 <gentext key="RevHistory" text="Istoricul versiunilor"/>
 <gentext key="revhistory" text="Istoricul versiunilor"/>
+<gentext key="Revision" text="Versiune"/>
+<gentext key="revision" text="Versiune"/>
 <gentext key="Section" text="Sec&#254;iune"/>
+<gentext key="section" text="sec."/>
 <gentext key="See" text="Vezi"/>
 <gentext key="see" text="Vezi"/>
 <gentext key="SeeAlso" text="Vezi &scedil;i"/>
 <gentext key="seealso" text="Vezi &scedil;i"/>
+<gentext key="Seealso" text="Vezi &scedil;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&#254;ie"/>
-<gentext key="TIP" text="INDICA&#222;IE"/>
+<gentext key="step" text="opera&#254;iune"/>
 <gentext key="Table" text="Tabel"/>
 <gentext key="table" text="Tabel"/>
+<gentext key="TIP" text="INDICA&#222;IE"/>
 <gentext key="Tip" text="Indica&#254;ie"/>
 <gentext key="tip" text="Indica&#254;ie"/>
 <gentext key="WARNING" text="AVERTISMENT"/>
 <gentext key="Warning" text="Avertisment"/>
 <gentext key="warning" text="Avertisment"/>
-<gentext key="appendix" text="anexa"/>
-<gentext key="sidebar" text="sidebar"/>
-<gentext key="chapter" text="cap."/>
-<gentext key="section" text="sec."/>
-<gentext key="step" text="opera&#254;iune"/>
-<gentext key="Seealso" text="Vezi &scedil;i"/>
 
-<gentext key="TableofContents" text="Cuprins"/>
-<gentext key="tableofcontents" text="Cuprins"/>
-<gentext key="in" text="&icirc;n"/>
+<gentext key="and" text="&scedil;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="and" text="&scedil;i"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="&icirc;n"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Note"/>
-<gentext key="notes" text="Note"/>
-<gentext key="TableNotes" text="Remarci"/>
-<gentext key="tablenotes" text="Remarci"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="element inexistent"/>
+<gentext key="notes" text="Note"/>
+<gentext key="Notes" text="Note"/>
 <gentext key="Pgs" text="Pagini"/>
 <gentext key="pgs" text="Pagini"/>
-<gentext key="unsupported" text="nerecunoscut de sisitem"/>
-<gentext key="xrefto" text="referin&#254;&#227; c&#227;tre"/>
-<gentext key="unexpectedelementname" text="Nume de element nea&scedil;teptat"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="Remarci"/>
+<gentext key="tablenotes" text="Remarci"/>
+<gentext key="TableofContents" text="Cuprins"/>
+<gentext key="tableofcontents" text="Cuprins"/>
+<gentext key="unexpectedelementname" text="Nume de element nea&scedil;teptat"/>
+<gentext key="unsupported" text="nerecunoscut de sisitem"/>
+<gentext key="xrefto" text="referin&#254;&#227; c&#227;tre"/>
 
-<gentext key="ListofTables" text="List&#227; de tabele"/>
-<gentext key="listoftables" text="List&#227; de tabele"/>
+<gentext key="listofequations" text="List&#227; de ecua&#254;ii"/>
+<gentext key="ListofEquations" text="List&#227; de ecua&#254;ii"/>
 <gentext key="ListofExamples" text="List&#227; de exemple"/>
 <gentext key="listofexamples" text="List&#227; de exemple"/>
 <gentext key="ListofFigures" text="List&#227; de figuri"/>
 <gentext key="listoffigures" text="List&#227; de figuri"/>
-<gentext key="ListofEquations" text="List&#227; de ecua&#254;ii"/>
-<gentext key="listofequations" text="List&#227; de ecua&#254;ii"/>
+<gentext key="listoftables" text="List&#227; de tabele"/>
+<gentext key="ListofTables" text="List&#227; de tabele"/>
 <gentext key="ListofUnknown" text="List&#227; de necunoscute"/>
 <gentext key="listofunknown" text="List&#227; de necunoscute"/>
 
+<gentext key="nav-home" text="Acas&#227;"/>
+<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="nav-next-sibling" text="Repede &#239;nainte"/>
-<gentext key="nav-next" text="&#206;nainte"/>
 <gentext key="nav-up" text="Sus"/>
-<gentext key="nav-home" text="Acas&#227;"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -361,9 +361,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/ru.xml b/gentext/locale/ru.xml
index 5ce844059..b8aff0c16 100644
--- a/gentext/locale/ru.xml
+++ b/gentext/locale/ru.xml
@@ -24,6 +24,7 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/> <!-- en -->
 <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;"/>
@@ -34,10 +35,11 @@
 <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="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="Colophon" text="Colophon"/>
@@ -60,21 +62,21 @@
 <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="See"/>
 <gentext key="glosssee" text="See"/> <!-- en -->
 <gentext key="GlossSeeAlso" text="See Also"/>
 <gentext key="glossseealso" text="See Also"/> <!-- en -->
-<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="IMPORTANT" text="&Vcy;&Acy;&ZHcy;&Ncy;&Ocy;"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/> <!-- en -->
 <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="LegalNotice" text="&Acy;&vcy;&tcy;&ocy;&rcy;&scy;&kcy;&icy;&iecy; &pcy;&rcy;&acy;&vcy;&acy;"/>
+<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="MsgAud" text="Audience"/>
@@ -83,11 +85,11 @@
 <gentext key="msglevel" text="Level"/> <!-- en -->
 <gentext key="MsgOrig" text="Origin"/>
 <gentext key="msgorig" text="Origin"/> <!-- en -->
-<gentext key="NOTE" text="&Zcy;&Acy;&Mcy;&IEcy;&CHcy;&Acy;&Ncy;&Icy;&IEcy;"/>
-<gentext key="Name" text="&Icy;&mcy;&yacy;"/>
 <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;"/>
@@ -114,55 +116,53 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="Revision" text="&Icy;&zcy;&dcy;&acy;&ncy;&icy;&iecy;"/>
-<gentext key="revision" text="&Icy;&zcy;&dcy;&acy;&ncy;&icy;&iecy;"/>
 <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="Section" text="&Rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="Section.abr" text="&Rcy;&acy;&zcy;&dcy;."/>
+<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="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="TIP" text="&Pcy;&Ocy;&Dcy;&Scy;&Kcy;&Acy;&Zcy;&Kcy;&Acy;"/>
+<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="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="appendix" text="&pcy;&rcy;&icy;&lcy;&ocy;&zhcy;&iecy;&ncy;&icy;&iecy;"/>
-<gentext key="chapter" text="&gcy;&lcy;&acy;&vcy;&acy;"/>
-<gentext key="section" text="&rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
-<gentext key="step" text="&shcy;&acy;&gcy;"/>
+<gentext key="Warning" text="&Vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;"/>
 
-<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="called" text=""/>
-<gentext key="in" text="&vcy;"/>
+<gentext key="and" text=""/> <!-- as far as it's seen "and" is used only in 
 <gentext key="by" text=""/>
-<gentext key="Edited" text="&Pcy;&ocy;&dcy; &rcy;&iecy;&dcy;&acy;&kcy;&tscy;&icy;&iecy;&jcy;"/>
+<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="and" text=""/> <!-- as far as it's seen "and" is used only in 
+<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;"/>
                                the list of author names, but "and" in such 
                                lists of Russian books is not traditionally 
                                used (I. Kouznetsov) -->
-<gentext key="listcomma" 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;"/>
@@ -171,34 +171,34 @@
 <!-- Suggestion of I. Kouznetsov: Error messages are better in English -->
 
 <gentext key="nonexistantelement" text="non-existant element"/>
-<gentext key="the" text=""/>
-<gentext key="Pgs" text="&Scy;&tcy;&rcy;."/>
 <gentext key="pgs" text="&Scy;&tcy;&rcy;."/>
-<gentext key="unsupported" text="unsupported"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="unexpected element name"/>
+<gentext key="Pgs" text="&Scy;&tcy;&rcy;."/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="the" text=""/>
+<gentext key="unexpectedelementname" text="unexpected element name"/>
+<gentext key="unsupported" text="unsupported"/>
+<gentext key="xrefto" text="xref to"/>
 
-<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="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="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="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="nav-next-sibling" text="&Scy;&lcy;&iecy;&dcy;. &pcy;&ocy;&dcy;&rcy;&acy;&zcy;&dcy;&iecy;&lcy;"/>
 <gentext key="x-nav-next" text="&Scy;&lcy;&iecy;&dcy;."/>
-<gentext key="nav-next" text="&#x0421;&#x043B;&#x0435;&#x0434;."/>
 
-<gentext key="nav-up" text="&Ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy; &vcy;&ycy;&shcy;&iecy;"/>
 <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;"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -394,9 +394,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/sk.xml b/gentext/locale/sk.xml
index 12155bf92..d60931955 100644
--- a/gentext/locale/sk.xml
+++ b/gentext/locale/sk.xml
@@ -19,6 +19,7 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/>
 <gentext key="Appendix" text="Dodatok"/>
+<gentext key="appendix" text="dodatok"/>
 <gentext key="Article" text="&#x010C;l&#x00E1;nok"/>
 <gentext key="article" text="&#x010C;l&#x00E1;nok"/>
 <gentext key="Bibliography" text="Bibliografia"/>
@@ -26,9 +27,10 @@
 <gentext key="Book" text="Kniha"/>
 <gentext key="book" text="Kniha"/>
 <gentext key="CAUTION" text="V&#x00DD;STRAHA"/>
-<gentext key="Caution" text="V&#x00FD;straha"/>
 <gentext key="caution" text="V&#x00FD;straha"/>
+<gentext key="Caution" text="V&#x00FD;straha"/>
 <gentext key="Chapter" text="Kapitola"/>
+<gentext key="chapter" text="kapitola"/>
 <gentext key="Colophon" text="Tir&#x00E1;&#x017E;"/>
 <gentext key="colophon" text="Tir&#x00E1;&#x017E;"/>
 <gentext key="Copyright" text="Copyright"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Pr&#x00ED;klad"/>
 <gentext key="Figure" text="Obr&#x00E1;zok"/>
 <gentext key="figure" text="Obr&#x00E1;zok"/>
+<gentext key="Glossary" text="Slovn&#x00ED;k"/>
+<gentext key="glossary" text="Slovn&#x00ED;k"/>
 <gentext key="GlossSee" text="Pozri"/>
 <gentext key="glosssee" text="Pozri"/>
 <gentext key="GlossSeeAlso" text="Pozri tie&#x017E;"/>
 <gentext key="glossseealso" text="Pozri tie&#x017E;"/>
-<gentext key="Glossary" text="Slovn&#x00ED;k"/>
-<gentext key="glossary" text="Slovn&#x00ED;k"/>
 <gentext key="IMPORTANT" text="D&#x00D4;LE&#x017D;IT&#x00C9;"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="D&#x00F4;le&#x017E;it&#x00E9;"/>
 <gentext key="important" text="D&#x00F4;le&#x017E;it&#x00E9;"/>
 <gentext key="Index" text="Zoznam"/>
 <gentext key="index" text="Zoznam"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Pr&#x00E1;vna pozn&#x00E1;mka"/>
 <gentext key="legalnotice" text="Pr&#x00E1;vna pozn&#x00E1;mka"/>
 <gentext key="MsgAud" text="Publikum"/>
@@ -87,77 +89,75 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Preh&#x013E;ad"/>
 <gentext key="refsynopsisdiv" text="Preh&#x013E;ad"/>
-<gentext key="Revision" text="Rev&#x00ED;zia"/>
-<gentext key="revision" text="Rev&#x00ED;zia"/>
 <gentext key="RevHistory" text="Preh&#x013E;ad rev&#x00ED;zi&#x00ED;"/>
 <gentext key="revhistory" text="Preh&#x013E;ad rev&#x00ED;zi&#x00ED;"/>
+<gentext key="Revision" text="Rev&#x00ED;zia"/>
+<gentext key="revision" text="Rev&#x00ED;zia"/>
 <gentext key="Section" text="Oddiel"/>
-<gentext key="See" text="Pozri"/>
+<gentext key="section" text="oddiel"/>
 <gentext key="see" text="Pozri"/>
-<gentext key="SeeAlso" text="Pozri tie&#x017E;"/>
+<gentext key="See" text="Pozri"/>
 <gentext key="seealso" text="Pozri tie&#x017E;"/>
+<gentext key="SeeAlso" text="Pozri tie&#x017E;"/>
+<gentext key="Seealso" text="Pozri tie&#x017E;"/>
 <gentext key="Set" text="Nastavi&#x0165;"/>
 <gentext key="set" text="Nastavi&#x0165;"/>
 <gentext key="SetIndex" text="Nastavi&#x0165; index"/>
 <gentext key="setindex" text="Nastavi&#x0165; index"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="bo&#x010D;n&#x00ED; li&#x0161;ta"/>
+<gentext key="step" text="krok"/>
 <gentext key="Step" text="Krok"/>
-<gentext key="TIP" text="TIP"/>
-<gentext key="Table" text="Tabu&#x013E;ka"/>
 <gentext key="table" text="Tabu&#x013E;ka"/>
+<gentext key="Table" text="Tabu&#x013E;ka"/>
+<gentext key="TIP" text="TIP"/>
 <gentext key="Tip" text="Tip"/>
 <gentext key="tip" text="Tip"/>
 <gentext key="WARNING" text="VAROVANIE"/>
 <gentext key="Warning" text="Varovanie"/>
 <gentext key="warning" text="Varovanie"/>
-<gentext key="appendix" text="dodatok"/>
-<gentext key="chapter" text="kapitola"/>
-<gentext key="section" text="oddiel"/>
-<gentext key="sidebar" text="bo&#x010D;n&#x00ED; li&#x0161;ta"/>
-<gentext key="step" text="krok"/>
-<gentext key="Seealso" text="Pozri tie&#x017E;"/>
 
-<gentext key="TableofContents" text="Obsah"/>
-<gentext key="tableofcontents" text="Obsah"/>
-<gentext key="in" text="v"/>
+<gentext key="and" text="a"/>
 <gentext key="by" text=""/>
 <gentext key="Edited" text="Vydan&#x00E9;"/>
 <gentext key="edited" text="Vydan&#x00E9;"/>
 <gentext key="Editedby" text="Vydan&#x00E9;"/>
 <gentext key="editedby" text="Vydan&#x00E9;"/>
-<gentext key="and" text="a"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="v"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Pozn&#x00E1;mky"/>
-<gentext key="notes" text="Pozn&#x00E1;mky"/>
-<gentext key="TableNotes" text="Pozn&#x00E1;mky"/>
-<gentext key="tablenotes" text="Pozn&#x00E1;mky"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="neexistuj&#x00FA;ci prvok"/>
+<gentext key="notes" text="Pozn&#x00E1;mky"/>
+<gentext key="Notes" text="Pozn&#x00E1;mky"/>
 <gentext key="Pgs" text="Str."/>
 <gentext key="pgs" text="Str."/>
-<gentext key="unsupported" text="nepodporovan&#x00FD;"/>
-<gentext key="xrefto" text="xref k"/>
-<gentext key="unexpectedelementname" text="Neo&#x010D;ak&#x00E1;van&#x00E9; meno prvku"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="Pozn&#x00E1;mky"/>
+<gentext key="tablenotes" text="Pozn&#x00E1;mky"/>
+<gentext key="TableofContents" text="Obsah"/>
+<gentext key="tableofcontents" text="Obsah"/>
+<gentext key="unexpectedelementname" text="Neo&#x010D;ak&#x00E1;van&#x00E9; meno prvku"/>
+<gentext key="unsupported" text="nepodporovan&#x00FD;"/>
+<gentext key="xrefto" text="xref k"/>
 
-<gentext key="ListofTables" text="Zoznam tabuliek"/>
-<gentext key="listoftables" text="Zoznam tabuliek"/>
+<gentext key="listofequations" text="Zoznam rovn&#x00ED;c"/>
+<gentext key="ListofEquations" text="Zoznam rovn&#x00ED;c"/>
 <gentext key="ListofExamples" text="Zoznam pr&#x00ED;kladov"/>
 <gentext key="listofexamples" text="Zoznam pr&#x00ED;kladov"/>
 <gentext key="ListofFigures" text="Zoznam obr&#x00E1;zkov"/>
 <gentext key="listoffigures" text="Zoznam obr&#x00E1;zkov"/>
-<gentext key="ListofEquations" text="Zoznam rovn&#x00ED;c"/>
-<gentext key="listofequations" text="Zoznam rovn&#x00ED;c"/>
+<gentext key="listoftables" text="Zoznam tabuliek"/>
+<gentext key="ListofTables" text="Zoznam tabuliek"/>
 <gentext key="ListofUnknown" text="Zoznam nezn&#x00E1;meho"/>
 <gentext key="listofunknown" text="Zoznam nezn&#x00E1;meho"/>
 
+<gentext key="nav-home" text="Domov"/>
+<gentext key="nav-next" text="&#x010E;al&#x0161;&#x00ED;"/>
+<gentext key="nav-next-sibling" text="R&#x00FD;chlo dopredu"/>
 <gentext key="nav-prev" text="Predch&#x00E1;dzaj&#x00FA;ci"/>
 <gentext key="nav-prev-sibling" text="R&#x00FD;chlo nazp&#x00E4;t"/>
-<gentext key="nav-next-sibling" text="R&#x00FD;chlo dopredu"/>
-<gentext key="nav-next" text="&#x010E;al&#x0161;&#x00ED;"/>
 <gentext key="nav-up" text="Hore"/>
-<gentext key="nav-home" text="Domov"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -353,9 +353,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/sl.xml b/gentext/locale/sl.xml
index dd9cfb08b..dfe22cc03 100644
--- a/gentext/locale/sl.xml
+++ b/gentext/locale/sl.xml
@@ -19,16 +19,18 @@
 <gentext key="Answer" text="O:"/>
 <gentext key="answer" text="O:"/>
 <gentext key="Appendix" text="Dodatek"/>
+<gentext key="appendix" text="dodatek"/>
 <gentext key="Article" text="&#x010C;lanek"/>
 <gentext key="article" text="&#x010C;lanek"/>
 <gentext key="Bibliography" text="Literatura"/>
 <gentext key="bibliography" text="Literatura"/>
 <gentext key="Book" text="Knjiga"/>
 <gentext key="book" text="Knjiga"/>
-<gentext key="CAUTION" text="OPOZORILO"/>
 <gentext key="Caution" text="Opozorilo"/>
 <gentext key="caution" text="Opozorilo"/>
+<gentext key="CAUTION" text="OPOZORILO"/>
 <gentext key="Chapter" text="Poglavje"/>
+<gentext key="chapter" text="poglavje"/>
 <gentext key="Colophon" text="Kolofon"/>
 <gentext key="colophon" text="Kolofon"/>
 <gentext key="Copyright" text="Pravna za&#x0161;&#x010D;ita"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Primer"/>
 <gentext key="Figure" text="Slika"/>
 <gentext key="figure" text="Slika"/>
+<gentext key="Glossary" text="Slovar&#x010D;ek"/>
+<gentext key="glossary" text="Slovar&#x010D;ek"/>
 <gentext key="GlossSee" text="glej"/>
 <gentext key="glosssee" text="glej"/>
 <gentext key="GlossSeeAlso" text="glej tudi"/>
 <gentext key="glossseealso" text="glej tudi"/>
-<gentext key="Glossary" text="Slovar&#x010D;ek"/>
-<gentext key="glossary" text="Slovar&#x010D;ek"/>
 <gentext key="IMPORTANT" text="POMEMBNO"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Pomembno"/>
 <gentext key="important" text="Pomembno"/>
 <gentext key="Index" text="Stvarno kazalo"/>
 <gentext key="index" text="Stvarno kazalo"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Pravno sporo&#x010D;ilo"/>
 <gentext key="legalnotice" text="Pravno sporo&#x010D;ilo"/>
 <gentext key="MsgAud" text="Ob&#x010D;instvo"/>
@@ -64,9 +66,9 @@
 <gentext key="msglevel" text="Raven"/>
 <gentext key="MsgOrig" text="Izvor"/>
 <gentext key="msgorig" text="Izvor"/>
+<gentext key="note" text="Opomba"/>
 <gentext key="NOTE" text="OPOMBA"/>
 <gentext key="Note" text="Opomba"/>
-<gentext key="note" text="Opomba"/>
 <gentext key="Part" text="Del"/>
 <gentext key="part" text="Del"/>
 <gentext key="Preface" text="Predgovor"/>
@@ -87,77 +89,75 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Sinopsis"/>
 <gentext key="refsynopsisdiv" text="Sinopsis"/>
-<gentext key="Revision" text="Razli&#x010D;ica"/>
-<gentext key="revision" text="Razli&#x010D;ica"/>
 <gentext key="RevHistory" text="Zgodovina razli&#x010D;ic"/>
 <gentext key="revhistory" text="Zgodovina razli&#x010D;ic"/>
+<gentext key="Revision" text="Razli&#x010D;ica"/>
+<gentext key="revision" text="Razli&#x010D;ica"/>
 <gentext key="Section" text="Razdelek"/>
-<gentext key="See" text="glej"/>
+<gentext key="section" text="razdelek"/>
 <gentext key="see" text="glej"/>
-<gentext key="SeeAlso" text="glej tudi"/>
+<gentext key="See" text="glej"/>
+<gentext key="Seealso" text="Glej tudi"/>
 <gentext key="seealso" text="glej tudi"/>
+<gentext key="SeeAlso" text="glej tudi"/>
 <gentext key="Set" text="Postavi"/>
 <gentext key="set" text="Postavi"/>                  <!-- ? -->
 <gentext key="SetIndex" text="Postavi stvarno kazalo"/>
 <gentext key="setindex" text="Postavi stvarno kazalo"/>   <!-- ? -->
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="sidebar"/>   <!-- ? -->
+<gentext key="step" text="korak"/>
 <gentext key="Step" text="Korak"/>
-<gentext key="TIP" text="NAMIG"/>
-<gentext key="Table" text="Tabela"/>
 <gentext key="table" text="Tabela"/>
+<gentext key="Table" text="Tabela"/>
+<gentext key="TIP" text="NAMIG"/>
 <gentext key="Tip" text="Namig"/>
 <gentext key="tip" text="Namig"/>
 <gentext key="WARNING" text="POZOR"/>
 <gentext key="Warning" text="Pozor"/>
 <gentext key="warning" text="Pozor"/>
-<gentext key="appendix" text="dodatek"/>
-<gentext key="chapter" text="poglavje"/>
-<gentext key="section" text="razdelek"/>
-<gentext key="sidebar" text="sidebar"/>   <!-- ? -->
-<gentext key="step" text="korak"/>
-<gentext key="Seealso" text="Glej tudi"/>
 
-<gentext key="TableofContents" text="Kazalo"/>
-<gentext key="tableofcontents" text="Kazalo"/>
-<gentext key="in" text="v"/>
+<gentext key="and" text="in"/>
 <gentext key="by" text="od"/>              <!-- ? -->
 <gentext key="Edited" text="Urejeno"/>
 <gentext key="edited" text="Urejeno"/>         <!-- ? -->
 <gentext key="Editedby" text="Urejeno od"/>
 <gentext key="editedby" text="Urejeno od"/>   <!-- ? -->
-<gentext key="and" text="in"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="v"/>
 <gentext key="lastlistcomma" text=","/>
+<gentext key="listcomma" text=","/>
+<gentext key="nonexistantelement" text="neobstoje&#x010D;i element"/>
 <gentext key="Notes" text="Notes"/>
 <gentext key="notes" text="Notes"/>           <!-- ? -->
-<gentext key="TableNotes" text="Notes"/>
-<gentext key="tablenotes" text="Notes"/>           <!-- ? -->
-<gentext key="nonexistantelement" text="neobstoje&#x010D;i element"/>
 <gentext key="Pgs" text="Str."/>
 <gentext key="pgs" text="Str."/>
-<gentext key="unsupported" text="nepodprto"/>
-<gentext key="xrefto" text="xref na"/>         <!-- ? -->
-<gentext key="unexpectedelementname" text="Nepri&#x010D;akovano ime elementa"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/>
+<gentext key="TableNotes" text="Notes"/>
+<gentext key="tablenotes" text="Notes"/>           <!-- ? -->
+<gentext key="TableofContents" text="Kazalo"/>
+<gentext key="tableofcontents" text="Kazalo"/>
+<gentext key="unexpectedelementname" text="Nepri&#x010D;akovano ime elementa"/>
+<gentext key="unsupported" text="nepodprto"/>
+<gentext key="xrefto" text="xref na"/>         <!-- ? -->
 
-<gentext key="ListofTables" text="Seznam tabel"/>
-<gentext key="listoftables" text="Seznam tabel"/>
+<gentext key="listofequations" text="Seznam ena&#x010D;b"/>
+<gentext key="ListofEquations" text="Seznam ena&#x010D;b"/>
 <gentext key="ListofExamples" text="Seznam primerov"/>
 <gentext key="listofexamples" text="Seznam primerov"/>
 <gentext key="ListofFigures" text="Seznam slik"/>
 <gentext key="listoffigures" text="Seznam slik"/>
-<gentext key="ListofEquations" text="Seznam ena&#x010D;b"/>
-<gentext key="listofequations" text="Seznam ena&#x010D;b"/>
+<gentext key="listoftables" text="Seznam tabel"/>
+<gentext key="ListofTables" text="Seznam tabel"/>
 <gentext key="ListofUnknown" text="Seznam neznanih stvari"/>
 <gentext key="listofunknown" text="Seznam neznanih stvari"/>   <!-- ? -->
 
+<gentext key="nav-home" text="Domov"/>
+<gentext key="nav-next" text="Naprej"/>
+<gentext key="nav-next-sibling" text="Hitro naprej"/>
 <gentext key="nav-prev" text="Nazaj"/>
 <gentext key="nav-prev-sibling" text="Hitro nazaj"/>
-<gentext key="nav-next-sibling" text="Hitro naprej"/>
-<gentext key="nav-next" text="Naprej"/>
 <gentext key="nav-up" text="Gor"/>
-<gentext key="nav-home" text="Domov"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -310,11 +310,11 @@
 <template name="index">%t</template>
 <template name="part"><Part/> %n. %t</template>
 <template name="preface">%t</template>
+<template name="question"><Question/> %n</template>
 <template name="reference">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
 <template name="table"><Table/> %n. %t</template>
-<template name="question"><Question/> %n</template>
 
 </context>
 
@@ -354,9 +354,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/sr.xml b/gentext/locale/sr.xml
index 0d2ed5de9..3473a5714 100644
--- a/gentext/locale/sr.xml
+++ b/gentext/locale/sr.xml
@@ -17,16 +17,18 @@
 <gentext key="Answer" text="O:"/>
 <gentext key="answer" text="O:"/>
 <gentext key="Appendix" text="Dodatak"/>
+<gentext key="appendix" text="dodatak"/>
 <gentext key="Article" text="\&#x010C;lanak"/>
 <gentext key="article" text="\&#x010C;lanak"/>
 <gentext key="Bibliography" text="Literatura"/>
 <gentext key="bibliography" text="Literatura"/>
 <gentext key="Book" text="Knjiga"/>
 <gentext key="book" text="Knjiga"/>
-<gentext key="CAUTION" text="UPOZORENJE"/>
 <gentext key="Caution" text="Upozorenje"/>
 <gentext key="caution" text="Upozorenje"/>
+<gentext key="CAUTION" text="UPOZORENJE"/>
 <gentext key="Chapter" text="Poglavlje"/>
+<gentext key="chapter" text="poglavlje"/>
 <gentext key="Colophon" text="Kolofon"/>
 <gentext key="colophon" text="Kolofon"/>
 <gentext key="Copyright" text="Pravna za\&#x0161;tita"/>
@@ -41,19 +43,19 @@
 <gentext key="example" text="Primer"/>
 <gentext key="Figure" text="Slika"/>
 <gentext key="figure" text="Slika"/>
+<gentext key="Glossary" text="Re\&#x010D;nik"/>
+<gentext key="glossary" text="Re\&#x010D;nik"/>
 <gentext key="GlossSee" text="Vidi"/>
 <gentext key="glosssee" text="Vidi"/>
 <gentext key="GlossSeeAlso" text="Vidi tako\&#x0111;e"/>
 <gentext key="glossseealso" text="Vidi tako\&#x0111;e"/>
-<gentext key="Glossary" text="Re\&#x010D;nik"/>
-<gentext key="glossary" text="Re\&#x010D;nik"/>
 <gentext key="IMPORTANT" text="VA\&#x017D;NO"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Va\&#x017E;no"/>
 <gentext key="important" text="Va\&#x017E;no"/>
 <gentext key="Index" text="Indeks"/>
 <gentext key="index" text="Indeks"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Pravno obave\&#x0161;tenje"/>
 <gentext key="legalnotice" text="Pravno obave\&#x0161;tenje"/>
 <gentext key="MsgAud" text="MsgAud"/>
@@ -62,9 +64,9 @@
 <gentext key="msglevel" text="Nivo"/>
 <gentext key="MsgOrig" text="Izvor"/>
 <gentext key="msgorig" text="Izvor"/>
+<gentext key="note" text="Primedba"/>
 <gentext key="NOTE" text="PRIMEDBA"/>
 <gentext key="Note" text="Primedba"/>
-<gentext key="note" text="Primedba"/>
 <gentext key="Part" text="Deo"/>
 <gentext key="part" text="Deo"/>
 <gentext key="Preface" text="Predgovor"/>
@@ -85,77 +87,75 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Sinopsis"/>
 <gentext key="refsynopsisdiv" text="Sinopsis"/>
-<gentext key="Revision" text="Revizija"/>
-<gentext key="revision" text="Revizija"/>
 <gentext key="RevHistory" text="Istorija revizija"/>
 <gentext key="revhistory" text="Istorija revizija"/>
+<gentext key="Revision" text="Revizija"/>
+<gentext key="revision" text="Revizija"/>
 <gentext key="Section" text="Odeljak"/>
-<gentext key="See" text="vidi"/>
+<gentext key="section" text="sekcija"/>
 <gentext key="see" text="vidi"/>
-<gentext key="SeeAlso" text="vidi tako\&#x0111;e"/>
+<gentext key="See" text="vidi"/>
+<gentext key="Seealso" text="Vidi tako\&#x0111;e"/>
 <gentext key="seealso" text="vidi tako\&#x0111;e"/>
-<gentext key="Set" text="Postavi"/>
+<gentext key="SeeAlso" text="vidi tako\&#x0111;e"/>
 <gentext key="set" text="Postavi"/>
+<gentext key="Set" text="Postavi"/>
 <gentext key="SetIndex" text="Postavi indeks"/>
 <gentext key="setindex" text="Postavi indeks"/>
 <gentext key="Sidebar" text=""/>
+<gentext key="sidebar" text="sidebar"/>
+<gentext key="step" text="korak"/>
 <gentext key="Step" text="Korak"/>
-<gentext key="TIP" text="SAVET"/>
-<gentext key="Table" text="Tabela"/>
 <gentext key="table" text="Tabela"/>
+<gentext key="Table" text="Tabela"/>
+<gentext key="TIP" text="SAVET"/>
 <gentext key="Tip" text="Savet"/>
 <gentext key="tip" text="Savet"/>
 <gentext key="WARNING" text="UPOZORENJE"/>
 <gentext key="Warning" text="Upozorenje"/>
 <gentext key="warning" text="Upozorenje"/>
-<gentext key="appendix" text="dodatak"/>
-<gentext key="chapter" text="poglavlje"/>
-<gentext key="section" text="sekcija"/>
-<gentext key="sidebar" text="sidebar"/>
-<gentext key="step" text="korak"/>
-<gentext key="Seealso" text="Vidi tako\&#x0111;e"/>
 
-<gentext key="TableofContents" text="Sadr\&#x017E;aj"/>
-<gentext key="tableofcontents" text="Sadr\&#x017E;aj"/>
-<gentext key="in" text="u"/>
+<gentext key="and" text="i"/>
 <gentext key="by" text="od"/>
 <gentext key="Edited" text="Ure\&#x0111;eno"/>
 <gentext key="edited" text="Ure\&#x0111;eno"/>
 <gentext key="Editedby" text="Ure\&#x0111;eno od"/>
 <gentext key="editedby" text="Ure\&#x0111;eno od"/>
-<gentext key="and" text="i"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="u"/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notes"/>
-<gentext key="notes" text="Notes"/>
-<gentext key="TableNotes" text="Notes"/>
-<gentext key="tablenotes" text="Notes"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="nepostoje\&#x0107;i element"/>
+<gentext key="notes" text="Notes"/>
+<gentext key="Notes" text="Notes"/>
 <gentext key="Pgs" text="Str."/>
 <gentext key="pgs" text="Str."/>
-<gentext key="unsupported" text="nepodr\&#x017E;ano"/>
-<gentext key="xrefto" text="xref na"/>
-<gentext key="unexpectedelementname" text="Neo\&#x010D;ekivano ime elementa"/>
 <gentext key="Revisedby" text="Revised by: "/>
 <gentext key="revisedby" text="Revised by: "/> <!-- en -->
+<gentext key="TableNotes" text="Notes"/>
+<gentext key="tablenotes" text="Notes"/>
+<gentext key="TableofContents" text="Sadr\&#x017E;aj"/>
+<gentext key="tableofcontents" text="Sadr\&#x017E;aj"/>
+<gentext key="unexpectedelementname" text="Neo\&#x010D;ekivano ime elementa"/>
+<gentext key="unsupported" text="nepodr\&#x017E;ano"/>
+<gentext key="xrefto" text="xref na"/>
 
-<gentext key="ListofTables" text="Spisak tabela"/>
-<gentext key="listoftables" text="Spisak tabela"/>
+<gentext key="listofequations" text="Spisak jedna\&#x010D;ina"/>
+<gentext key="ListofEquations" text="Spisak jedna\&#x010D;ina"/>
 <gentext key="ListofExamples" text="Spisak primera"/>
 <gentext key="listofexamples" text="Spisak primera"/>
 <gentext key="ListofFigures" text="Spisak slika"/>
 <gentext key="listoffigures" text="Spisak slika"/>
-<gentext key="ListofEquations" text="Spisak jedna\&#x010D;ina"/>
-<gentext key="listofequations" text="Spisak jedna\&#x010D;ina"/>
+<gentext key="listoftables" text="Spisak tabela"/>
+<gentext key="ListofTables" text="Spisak tabela"/>
 <gentext key="ListofUnknown" text="Spisak nepoznanica"/>
 <gentext key="listofunknown" text="Spisak nepoznanica"/>
 
+<gentext key="nav-home" text="Ku\&#x0107;i"/>
+<gentext key="nav-next" text="Napred"/>
+<gentext key="nav-next-sibling" text="Brzo napred"/>
 <gentext key="nav-prev" text="Nazad"/>
 <gentext key="nav-prev-sibling" text="Brzo nazad"/>
-<gentext key="nav-next-sibling" text="Brzo napred"/>
-<gentext key="nav-next" text="Napred"/>
 <gentext key="nav-up" text="Gore"/>
-<gentext key="nav-home" text="Ku\&#x0107;i"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -351,9 +351,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/sv.xml b/gentext/locale/sv.xml
index 65914fb34..5c059dc47 100644
--- a/gentext/locale/sv.xml
+++ b/gentext/locale/sv.xml
@@ -19,6 +19,7 @@
 <gentext key="Answer" text="A:"/>
 <gentext key="answer" text="A:"/> <!-- en -->
 <gentext key="Appendix" text="Appendix"/>
+<gentext key="appendix" text="appendix"/>
 <gentext key="Article" text="Artikel"/>
 <gentext key="article" text="Artikel"/>
 <gentext key="Bibliography" text="Bibliografi"/>
@@ -29,6 +30,7 @@
 <gentext key="Caution" text="Observera"/>
 <gentext key="caution" text="Observera"/> 
 <gentext key="Chapter" text="Kapitel"/>
+<gentext key="chapter" text="kapitel"/>
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- en -->
 <gentext key="Copyright" text="Copyright"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="Exempel"/>
 <gentext key="Figure" text="Figur"/>
 <gentext key="figure" text="Figur"/>
+<gentext key="Glossary" text="Gloslista"/>
+<gentext key="glossary" text="Gloslista"/>
 <gentext key="GlossSee" text="Se"/>
 <gentext key="glosssee" text="Se"/>
 <gentext key="GlossSeeAlso" text="Se &#196;ven"/>
 <gentext key="glossseealso" text="Se &#196;ven"/>
-<gentext key="Glossary" text="Gloslista"/>
-<gentext key="glossary" text="Gloslista"/>
 <gentext key="IMPORTANT" text="VIKTIGT"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="Viktigt"/>
 <gentext key="important" text="Viktigt"/>
 <gentext key="Index" text="Index"/>
 <gentext key="index" text="Index"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Legal Notice"/>
 <gentext key="legalnotice" text="Legal Notice"/> <!-- en -->
 <gentext key="MsgAud" text="M&#229;lgrupp"/>
@@ -64,9 +66,9 @@
 <gentext key="msglevel" text="Niv&#229;"/>
 <gentext key="MsgOrig" text="Ursprung"/>
 <gentext key="msgorig" text="Ursprung"/>
+<gentext key="note" text="Not"/>
 <gentext key="NOTE" text="NOT"/>
 <gentext key="Note" text="Not"/>
-<gentext key="note" text="Not"/>
 <gentext key="Part" text="Del"/>
 <gentext key="part" text="Del"/>
 <gentext key="Preface" text="F&#246;retal"/>
@@ -79,86 +81,84 @@
 <gentext key="question" text="Fr&#229;ga:"/>
 <gentext key="RefEntry" text=""/>
 <gentext key="refentry" text=""/>
-<gentext key="RefName" text="Namn"/>
-<gentext key="refname" text="Namn"/>
 <gentext key="Reference" text="Referens"/>
 <gentext key="reference" text="Referens"/>
+<gentext key="RefName" text="Namn"/>
+<gentext key="refname" text="Namn"/>
 <gentext key="RefSection" text=""/>
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/> <!-- en -->
-<gentext key="Revision" text="Revision"/>
-<gentext key="revision" text="Revision"/>
 <gentext key="RevHistory" text="Revisions Historik;"/>
 <gentext key="revhistory" text="Revisions Historik;"/>
+<gentext key="Revision" text="Revision"/>
+<gentext key="revision" text="Revision"/>
 <gentext key="Section" text="Avsnitt"/>
-<gentext key="See" text="Se"/>
+<gentext key="section" text="avsnitt"/>
 <gentext key="see" text="Se"/>
-<gentext key="SeeAlso" text="Se &#196;ven"/>
+<gentext key="See" text="Se"/>
 <gentext key="seealso" text="Se &#196;ven"/>
-<gentext key="Set" text="Set"/>
+<gentext key="SeeAlso" text="Se &#196;ven"/>
+<gentext key="Seealso" text="Se &#228;ven"/>
 <gentext key="set" text="Set"/>
+<gentext key="Set" text="Set"/>
 <gentext key="SetIndex" text="Set Index"/>
 <gentext key="setindex" text="Set Index"/>
-<gentext key="Sidebar" text="Sidebar"/>
 <gentext key="sidebar" text="sidebar"/>
+<gentext key="Sidebar" text="Sidebar"/>
+<gentext key="step" text="steg"/>
 <gentext key="Step" text="Steg"/>
-<gentext key="TIP" text="TIPS"/>
 <gentext key="Table" text="Tabell"/>
 <gentext key="table" text="Tabell"/>
-<gentext key="Tip" text="Tips"/>
 <gentext key="tip" text="Tips"/>
+<gentext key="TIP" text="TIPS"/>
+<gentext key="Tip" text="Tips"/>
+<gentext key="warning" text="Varning"/>
 <gentext key="WARNING" text="VARNING"/>
 <gentext key="Warning" text="Varning"/>
-<gentext key="warning" text="Varning"/>
-<gentext key="appendix" text="appendix"/>
-<gentext key="chapter" text="kapitel"/>
-<gentext key="section" text="avsnitt"/>
-<gentext key="step" text="steg"/>
-<gentext key="Seealso" text="Se &#228;ven"/>
 
-<gentext key="TableofContents" text="Inneh&#229;llsf&#246;rteckning"/>
-<gentext key="tableofcontents" text="Inneh&#229;llsf&#246;rteckning"/>
-<gentext key="called" text="kallas"/>
-<gentext key="in" text="i"/>
+<gentext key="and" text="och"/>
 <gentext key="by" text="av"/>
-<gentext key="Edited" text="Redigerad"/>
+<gentext key="called" text="kallas"/>
 <gentext key="edited" text="Redigerad"/>
+<gentext key="Edited" text="Redigerad"/>
 <gentext key="Editedby" text="Redigerad av"/>
 <gentext key="editedby" text="Redigerad av"/>
-<gentext key="and" text="och"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="i"/>
 <gentext key="lastlistcomma" text=","/>
+<gentext key="listcomma" text=","/>
+<gentext key="nonexistantelement" text="non-existant element"/>
 <gentext key="Notes" text="Noter"/>
+<gentext key="Pgs" text="Sid."/>
+<gentext key="pgs" text="Sid."/>
+<gentext key="Revisedby" text="Reviderad av: "/>
+<gentext key="revisedby" text="Reviderad av: "/>
 <gentext key="TableNotes" text="Noter"/>
 <gentext key="tablenotes" text="Noter"/>
-<gentext key="nonexistantelement" text="non-existant element"/>
+<gentext key="TableofContents" text="Inneh&#229;llsf&#246;rteckning"/>
+<gentext key="tableofcontents" text="Inneh&#229;llsf&#246;rteckning"/>
 <gentext key="the" text=""/>
-<gentext key="Pgs" text="Sid."/>
-<gentext key="pgs" text="Sid."/>
+<gentext key="unexpectedelementname" text="Unexpected element name"/>
 <gentext key="unsupported" text="unsupported"/>
 <gentext key="xrefto" text="xref till"/>
-<gentext key="unexpectedelementname" text="Unexpected element name"/>
-<gentext key="Revisedby" text="Reviderad av: "/>
-<gentext key="revisedby" text="Reviderad av: "/>
 
-<gentext key="ListofTables" text="Tabellf&#246;rteckning"/>
-<gentext key="listoftables" text="Tabellf&#246;rteckning"/>
+<gentext key="listofequations" text="Ekvationsf&#246;rteckning"/>
+<gentext key="ListofEquations" text="Ekvationsf&#246;rteckning"/>
 <gentext key="ListofExamples" text="Exempelf&#246;rteckning"/>
 <gentext key="listofexamples" text="Exempelf&#246;rteckning"/>
 <gentext key="ListofFigures" text="Figurf&#246;rteckning"/>
 <gentext key="listoffigures" text="Figurf&#246;rteckning"/>
-<gentext key="ListofEquations" text="Ekvationsf&#246;rteckning"/>
-<gentext key="listofequations" text="Ekvationsf&#246;rteckning"/>
+<gentext key="listoftables" text="Tabellf&#246;rteckning"/>
+<gentext key="ListofTables" text="Tabellf&#246;rteckning"/>
 <gentext key="ListofUnknown" text="F&#246;rteckning av ok&#228;nda"/>
 <gentext key="listofunknown" text="F&#246;rteckning av ok&#228;nda"/>
 
+<gentext key="nav-home" text="Hem"/>
+<gentext key="nav-next" text="N&#228;sta"/>
+<gentext key="nav-next-sibling" text="Snabbt bak&#229;t"/>
 <gentext key="nav-prev" text="F&#246;reg&#229;ende"/>
 <gentext key="nav-prev-sibling" text="Snabbt fram&#229;t"/>
-<gentext key="nav-next-sibling" text="Snabbt bak&#229;t"/>
-<gentext key="nav-next" text="N&#228;sta"/>
 <gentext key="nav-up" text="Upp"/>
-<gentext key="nav-home" text="Hem"/>
 
 <dingbat key="startquote" text="&#x201C;"/>
 <dingbat key="endquote" text="&#x201D;"/>
@@ -354,9 +354,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/tr.xml b/gentext/locale/tr.xml
index 4f134fede..0b21f5867 100644
--- a/gentext/locale/tr.xml
+++ b/gentext/locale/tr.xml
@@ -47,19 +47,19 @@
 <gentext key="example" text="&#214;rnek"/>
 <gentext key="Figure" text="&#222;ekil"/>
 <gentext key="figure" text="&#254;ekil"/>
+<gentext key="Glossary" text="S&#246;zl&#252;k"/>
+<gentext key="glossary" text="S&#246;zl&#252;k"/>
 <gentext key="GlossSee" text="Bkz."/>
 <gentext key="glosssee" text="Bkz."/>
 <gentext key="GlossSeeAlso" text="Bkz."/>
 <gentext key="glossseealso" text="Bkz."/>
-<gentext key="Glossary" text="S&#246;zl&#252;k"/>
-<gentext key="glossary" text="S&#246;zl&#252;k"/>
 <gentext key="IMPORTANT" text="&#214;NEML&#221;"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/>
 <gentext key="Important" text="&#214;nemli"/>
 <gentext key="important" text="&#214;nemli"/>
 <gentext key="Index" text="Dizin"/>
 <gentext key="index" text="Dizin"/>
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/>
 <gentext key="LegalNotice" text="Yasal Not"/>
 <gentext key="legalnotice" text="Yasal Not"/>
 <gentext key="MsgAud" text="Hedef okuyucu kitlesi"/>
@@ -92,16 +92,17 @@
 <gentext key="refsection" text=""/>
 <gentext key="RefSynopsisDiv" text="Synopsis"/>
 <gentext key="refsynopsisdiv" text="Synopsis"/>
-<gentext key="Revision" text="Bask&#253;"/>
-<gentext key="revision" text="Bask&#253;"/>
 <gentext key="RevHistory" text="Bask&#253; Tarih&#231;esi"/>
 <gentext key="revhistory" text="Bask&#253; Tarih&#231;esi"/>
-<gentext key="Section" text="K&#253;s&#253;m"/>
+<gentext key="Revision" text="Bask&#253;"/>
+<gentext key="revision" text="Bask&#253;"/>
 <gentext key="section" text="K&#253;s&#253;"/>
+<gentext key="Section" text="K&#253;s&#253;m"/>
 <gentext key="See" text="Bkz."/>
 <gentext key="see" text="Bkz."/>
 <gentext key="SeeAlso" text="Bkz."/>
 <gentext key="seealso" text="Bkz."/>
+<gentext key="Seealso" text="Bkz."/>
 <gentext key="Set" text="Tak&#253;m"/>
 <gentext key="set" text="Tak&#253;m"/>
 <gentext key="SetIndex" text="Tak&#253;m Dizini"/>
@@ -110,57 +111,56 @@
 <gentext key="sidebar" text="Yan S&#252;tun"/>
 <gentext key="Step" text="Ad&#253;m"/>
 <gentext key="step" text="Ad&#253;m"/>
-<gentext key="TIP" text="&#221;PUCU"/>
 <gentext key="Table" text="Tablo"/>
 <gentext key="table" text="Tablo"/>
+<gentext key="TIP" text="&#221;PUCU"/>
 <gentext key="Tip" text="&#221;pucu"/>
 <gentext key="tip" text="&#221;pucu"/>
-<gentext key="WARNING" text="UYARI"/>
 <gentext key="Warning" text="Uyar&#253;"/>
 <gentext key="warning" text="Uyar&#253;"/>
-<gentext key="Seealso" text="Bkz."/>
+<gentext key="WARNING" text="UYARI"/>
 
-<gentext key="TableofContents" text="&#221;&#231;indekiler"/>
-<gentext key="tableofcontents" text="&#221;&#231;indekiler"/>
-<gentext key="in" text=""/>
+<gentext key="and" text="ve"/>
 <gentext key="by" text=""/>
 <gentext key="Edited" text="Yay&#253;na Haz&#253;rlayan"/>
 <gentext key="edited" text="yay&#253;na haz&#253;rlayan"/>
 <gentext key="Editedby" text="Yay&#253;na Haz&#253;rlayan "/>
 <gentext key="editedby" text="Yay&#253;na Haz&#253;rlayan "/>
-<gentext key="and" text="ve"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in" text=""/>
 <gentext key="lastlistcomma" text=","/>
-<gentext key="Notes" text="Notlar"/>
-<gentext key="notes" text="Notlar"/>
-<gentext key="TableNotes" text="Notlar"/>
-<gentext key="tablenotes" text="Notlar"/>
+<gentext key="listcomma" text=","/>
 <gentext key="nonexistantelement" text="var olmayan eleman"/>
+<gentext key="notes" text="Notlar"/>
+<gentext key="Notes" text="Notlar"/>
 <gentext key="Pgs" text="Sayfa"/>
 <gentext key="pgs" text="Sayfa"/>
-<gentext key="unsupported" text="desteklenmiyor"/>
-<gentext key="xrefto" text="xref to"/>
-<gentext key="unexpectedelementname" text="Beklenmedik eleman ad&#253;"/>
 <gentext key="Revisedby" text="D&#252;zeltmeler: "/>
 <gentext key="revisedby" text="D&#252;zeltmeler: "/>
+<gentext key="TableNotes" text="Notlar"/>
+<gentext key="tablenotes" text="Notlar"/>
+<gentext key="TableofContents" text="&#221;&#231;indekiler"/>
+<gentext key="tableofcontents" text="&#221;&#231;indekiler"/>
+<gentext key="unexpectedelementname" text="Beklenmedik eleman ad&#253;"/>
+<gentext key="unsupported" text="desteklenmiyor"/>
+<gentext key="xrefto" text="xref to"/>
 
-<gentext key="ListofTables" text="Tablolar"/>
-<gentext key="listoftables" text="Tablolar"/>
+<gentext key="listofequations" text="Denklemler"/>
+<gentext key="ListofEquations" text="Denklemler"/>
 <gentext key="ListofExamples" text="&#214;rnekler"/>
 <gentext key="listofexamples" text="&#214;rnekler"/>
 <gentext key="ListofFigures" text="&#222;ekiller"/>
 <gentext key="listoffigures" text="&#222;ekiller"/>
-<gentext key="ListofEquations" text="Denklemler"/>
-<gentext key="listofequations" text="Denklemler"/>
+<gentext key="listoftables" text="Tablolar"/>
+<gentext key="ListofTables" text="Tablolar"/>
 <gentext key="ListofUnknown" text="Bilinmeyenler"/>
 <gentext key="listofunknown" text="Bilinmeyenler"/>
 
+<gentext key="nav-home" text="Ba&#254;lang&#253;&#231;"/>
+<gentext key="nav-next" text="Sonraki"/>
+<gentext key="nav-next-sibling" text="Sonraki b&#246;l&#252;m"/>
 <gentext key="nav-prev" text="&#214;nceki"/>
 <gentext key="nav-prev-sibling" text="&#214;nceki b&#246;l&#252;m"/>
-<gentext key="nav-next-sibling" text="Sonraki b&#246;l&#252;m"/>
-<gentext key="nav-next" text="Sonraki"/>
 <gentext key="nav-up" text="Yukar&#253;"/>
-<gentext key="nav-home" text="Ba&#254;lang&#253;&#231;"/>
 
 <gentext key="sectioncalled"       text=""/>
 
@@ -220,8 +220,8 @@
 <template name="productionset.formal"><ProductionSet/> %n. %t</template>
 <template name="qandadiv">%t</template>
 <template name="qandaset">%t</template>
-<template name="reference">%t</template>
 <template name="refentry">%t</template>
+<template name="reference">%t</template>
 <template name="refsect1">%t</template>
 <template name="refsect2">%t</template>
 <template name="refsect3">%t</template>
@@ -308,6 +308,7 @@
 
 <context name="xref">
 
+<template name="answer"><Answer/> %n</template>
 <template name="appendix"><Appendix/> %n</template>
 <template name="article">%t</template>
 <template name="bibliography">%t</template>
@@ -324,7 +325,6 @@
 <template name="preface">%t</template>
 <template name="procedure"><Procedure/> %n</template>
 <template name="question"><Question/> %n</template>
-<template name="answer"><Answer/> %n</template>
 <template name="reference">%t</template>
 <template name="set">%t</template>
 <template name="setindex">%t</template>
@@ -368,9 +368,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/zh_cn.xml b/gentext/locale/zh_cn.xml
index 8c7d45613..f22245ee4 100644
--- a/gentext/locale/zh_cn.xml
+++ b/gentext/locale/zh_cn.xml
@@ -19,6 +19,7 @@
 <gentext key="Answer" text="&#x7B54;:"/>
 <gentext key="answer" text="&#x7B54;:"/> <!-- GB2312 "&#180;&#240;:" -->
 <gentext key="Appendix" text="&#x9644;&#x5F55;"/> <!-- GB2312 "&#184;&#189;&#194;&#188;" -->
+<gentext key="appendix" text="&#x9644;&#x5F55;"/> <!-- GB2312 "&#184;&#189;&#194;&#188;" -->
 <gentext key="Article" text="&#x6587;&#x7AE0;"/>
 <gentext key="article" text="&#x6587;&#x7AE0;"/> <!-- GB2312 "&#206;&#196;&#213;&#194;" -->
 <gentext key="Bibliography" text="&#x53C2;&#x8003;&#x4E66;&#x76EE;"/>
@@ -29,6 +30,7 @@
 <gentext key="Caution" text="&#x6CE8;&#x610F;"/>
 <gentext key="caution" text="&#x6CE8;&#x610F;"/> <!-- GB2312 "&#215;&#162;&#210;&#226;" -->
 <gentext key="Chapter" text="&#x7AE0;"/> <!-- GB2312 "&#213;&#194;" -->
+<gentext key="chapter" text="&#x7AE0;"/> <!-- GB2312 "&#213;&#194;" -->
 <gentext key="Colophon" text="Colophon"/>
 <gentext key="colophon" text="Colophon"/> <!-- GB2312 "Colophon" -->
 <gentext key="Copyright" text="&#x7248;&#x6743;"/>
@@ -43,19 +45,19 @@
 <gentext key="example" text="&#x4F8B;&#x5B50;"/> <!-- GB2312 "&#192;&#253;&#215;&#211;" -->
 <gentext key="Figure" text="&#x56FE;&#x5F62;"/>
 <gentext key="figure" text="&#x56FE;&#x5F62;"/> <!-- GB2312 "&#205;&#188;&#208;&#206;" -->
+<gentext key="Glossary" text="&#x672F;&#x8BED;&#x8868;"/>
+<gentext key="glossary" text="&#x672F;&#x8BED;&#x8868;"/> <!-- GB2312 "&#202;&#245;&#211;&#239;&#177;&#237;" -->
 <gentext key="GlossSee" text="&#x89C1;"/>
 <gentext key="glosssee" text="&#x89C1;"/> <!-- GB2312 "&#188;&#251;" -->
 <gentext key="GlossSeeAlso" text="&#x53E6;&#x89C1;"/>
 <gentext key="glossseealso" text="&#x53E6;&#x89C1;"/> <!-- GB2312 "&#193;&#237;&#188;&#251;" -->
-<gentext key="Glossary" text="&#x672F;&#x8BED;&#x8868;"/>
-<gentext key="glossary" text="&#x672F;&#x8BED;&#x8868;"/> <!-- GB2312 "&#202;&#245;&#211;&#239;&#177;&#237;" -->
 <gentext key="IMPORTANT" text="&#x91CD;&#x8981;"/>
-<gentext key="ISBN" text="ISBN"/>
-<gentext key="isbn" text="ISBN"/> <!-- GB2312 "ISBN" -->
 <gentext key="Important" text="&#x91CD;&#x8981;"/>
 <gentext key="important" text="&#x91CD;&#x8981;"/> <!-- GB2312 "&#214;&#216;&#210;&#170;" -->
 <gentext key="Index" text="&#x7D22;&#x5F15;"/>
 <gentext key="index" text="&#x7D22;&#x5F15;"/> <!-- GB2312 "&#203;&#247;&#210;&#253;" -->
+<gentext key="ISBN" text="ISBN"/>
+<gentext key="isbn" text="ISBN"/> <!-- GB2312 "ISBN" -->
 <gentext key="LegalNotice" text="&#x6CD5;&#x5F8B;&#x5E03;&#x544A;"/>
 <gentext key="legalnotice" text="&#x6CD5;&#x5F8B;&#x5E03;&#x544A;"/> <!-- GB2312 "&#183;&#168;&#194;&#201;&#178;&#188;&#184;&#230;" -->
 <gentext key="MsgAud" text="&#x8BFB;&#x8005;"/>
@@ -87,77 +89,75 @@
 <gentext key="refsection" text=""/> <!-- GB2312 "" -->
 <gentext key="RefSynopsisDiv" text="&#x5927;&#x7EB2;"/>
 <gentext key="refsynopsisdiv" text="&#x5927;&#x7EB2;"/> <!-- GB2312 "&#180;&#243;&#184;&#217;" -->
-<gentext key="Revision" text="&#x4FEE;&#x8BA2;"/>
-<gentext key="revision" text="&#x4FEE;&#x8BA2;"/> <!-- GB2312 "&#208;&#222;&#182;&#169;" -->
 <gentext key="RevHistory" text="&#x4FEE;&#x8BA2;&#x5386;&#x53F2;"/>
 <gentext key="revhistory" text="&#x4FEE;&#x8BA2;&#x5386;&#x53F2;"/> <!-- GB2312 "&#208;&#222;&#182;&#169;&#192;&#250;&#202;&#183;" -->
+<gentext key="Revision" text="&#x4FEE;&#x8BA2;"/>
+<gentext key="revision" text="&#x4FEE;&#x8BA2;"/> <!-- GB2312 "&#208;&#222;&#182;&#169;" -->
 <gentext key="Section" text="&#x8282;"/> <!-- GB2312 "&#189;&#218;" -->
+<gentext key="section" text="&#x8282;"/> <!-- GB2312 "&#189;&#218;" -->
 <gentext key="See" text="&#x89C1;"/>
 <gentext key="see" text="&#x89C1;"/> <!-- GB2312 "&#188;&#251;" -->
 <gentext key="SeeAlso" text="&#x53E6;&#x89C1;"/>
+<gentext key="Seealso" text="&#x53E6;&#x89C1;"/>
 <gentext key="seealso" text="&#x53E6;&#x89C1;"/> <!-- GB2312 "&#193;&#237;&#188;&#251;" -->
 <gentext key="Set" text="Set"/>
 <gentext key="set" text="Set"/> <!-- GB2312 "Set" -->
 <gentext key="SetIndex" text="Set Index"/>
 <gentext key="setindex" text="Set Index"/> <!-- GB2312 "Set Index" -->
 <gentext key="Sidebar" text=""/> <!-- GB2312 "" -->
+<gentext key="sidebar" text="sidebar"/> <!-- GB2312 "sidebar" -->
+<gentext key="step" text="&#x6B65;&#x9AA4;"/> <!-- GB2312 "&#178;&#189;&#214;&#232;" -->
 <gentext key="Step" text="&#x6B65;&#x9AA4;"/> <!-- GB2312 "&#178;&#189;&#214;&#232;" -->
-<gentext key="TIP" text="&#x63D0;&#x793A;"/>
 <gentext key="Table" text="&#x8868;&#x683C;"/>
 <gentext key="table" text="&#x8868;&#x683C;"/> <!-- GB2312 "&#177;&#237;&#184;&#241;" -->
+<gentext key="TIP" text="&#x63D0;&#x793A;"/>
 <gentext key="Tip" text="&#x63D0;&#x793A;"/>
 <gentext key="tip" text="&#x63D0;&#x793A;"/> <!-- GB2312 "&#204;&#225;&#202;&#190;" -->
-<gentext key="WARNING" text="&#x8B66;&#x544A;"/>
 <gentext key="Warning" text="&#x8B66;&#x544A;"/>
+<gentext key="WARNING" text="&#x8B66;&#x544A;"/>
 <gentext key="warning" text="&#x8B66;&#x544A;"/> <!-- GB2312 "&#190;&#175;&#184;&#230;" -->
-<gentext key="appendix" text="&#x9644;&#x5F55;"/> <!-- GB2312 "&#184;&#189;&#194;&#188;" -->
-<gentext key="chapter" text="&#x7AE0;"/> <!-- GB2312 "&#213;&#194;" -->
-<gentext key="section" text="&#x8282;"/> <!-- GB2312 "&#189;&#218;" -->
-<gentext key="sidebar" text="sidebar"/> <!-- GB2312 "sidebar" -->
-<gentext key="step" text="&#x6B65;&#x9AA4;"/> <!-- GB2312 "&#178;&#189;&#214;&#232;" -->
-<gentext key="Seealso" text="&#x53E6;&#x89C1;"/>
 
-<gentext key="TableofContents" text="&#x76EE;&#x5F55;"/>
-<gentext key="tableofcontents" text="&#x76EE;&#x5F55;"/> <!-- GB2312 "&#196;&#191;&#194;&#188;" -->
-<gentext key="in" text="&#x5728;"/> <!-- GB2312 "&#212;&#218;" -->
+<gentext key="and" text="&#x548C;"/> <!-- GB2312 "&#186;&#205;" -->
 <gentext key="by" text="&#x7531;"/> <!-- GB2312 "&#211;&#201;" -->
 <gentext key="Edited" text="&#x7F16;&#x8F91;"/>
 <gentext key="edited" text="&#x7F16;&#x8F91;"/> <!-- GB2312 "&#177;&#224;&#188;&#173;" -->
 <gentext key="Editedby" text="&#x7F16;&#x8F91;"/>
 <gentext key="editedby" text="&#x7F16;&#x8F91;"/> <!-- GB2312 "&#177;&#224;&#188;&#173;" -->
-<gentext key="and" text="&#x548C;"/> <!-- GB2312 "&#186;&#205;" -->
-<gentext key="listcomma" text=","/>
+<gentext key="in" text="&#x5728;"/> <!-- GB2312 "&#212;&#218;" -->
 <gentext key="lastlistcomma" text=","/>
+<gentext key="listcomma" text=","/>
+<gentext key="nonexistantelement" text="&#x4E0D;&#x5B58;&#x5728;&#x7684;&#x5143;&#x7D20;"/> <!-- GB2312 "&#178;&#187;&#180;&#230;&#212;&#218;&#181;&#196;&#212;&#170;&#203;&#216;" -->
 <gentext key="Notes" text="&#x6CE8;"/>
 <gentext key="notes" text="&#x6CE8;"/> <!-- GB2312 "&#215;&#162;" -->
-<gentext key="TableNotes" text="&#x6CE8;"/>
-<gentext key="tablenotes" text="&#x6CE8;"/> <!-- GB2312 "&#215;&#162;" -->
-<gentext key="nonexistantelement" text="&#x4E0D;&#x5B58;&#x5728;&#x7684;&#x5143;&#x7D20;"/> <!-- GB2312 "&#178;&#187;&#180;&#230;&#212;&#218;&#181;&#196;&#212;&#170;&#203;&#216;" -->
 <gentext key="Pgs" text="&#x9875;"/>
 <gentext key="pgs" text="&#x9875;"/> <!-- GB2312 "&#210;&#179;" -->
-<gentext key="unsupported" text="&#x4E0D;&#x652F;&#x6301;"/> <!-- GB2312 "&#178;&#187;&#214;&#167;&#179;&#214;" -->
-<gentext key="xrefto" text="&#x53C2;&#x7167;"/> <!-- GB2312 "&#178;&#206;&#213;&#213;" -->
-<gentext key="unexpectedelementname" text="&#x672A;&#x9884;&#x6599;&#x5230;&#x7684;&#x5143;&#x7D20;&#x540D;"/> <!-- GB2312 "&#206;&#180;&#212;&#164;&#193;&#207;&#181;&#189;&#181;&#196;&#212;&#170;&#203;&#216;&#195;&#251;" -->
 <gentext key="Revisedby" text="&#x4FEE;&#x8BA2;"/>
 <gentext key="revisedby" text="&#x4FEE;&#x8BA2;"/> <!-- GB2312 "&#208;&#222;&#182;&#169;" -->
+<gentext key="TableNotes" text="&#x6CE8;"/>
+<gentext key="tablenotes" text="&#x6CE8;"/> <!-- GB2312 "&#215;&#162;" -->
+<gentext key="TableofContents" text="&#x76EE;&#x5F55;"/>
+<gentext key="tableofcontents" text="&#x76EE;&#x5F55;"/> <!-- GB2312 "&#196;&#191;&#194;&#188;" -->
+<gentext key="unexpectedelementname" text="&#x672A;&#x9884;&#x6599;&#x5230;&#x7684;&#x5143;&#x7D20;&#x540D;"/> <!-- GB2312 "&#206;&#180;&#212;&#164;&#193;&#207;&#181;&#189;&#181;&#196;&#212;&#170;&#203;&#216;&#195;&#251;" -->
+<gentext key="unsupported" text="&#x4E0D;&#x652F;&#x6301;"/> <!-- GB2312 "&#178;&#187;&#214;&#167;&#179;&#214;" -->
+<gentext key="xrefto" text="&#x53C2;&#x7167;"/> <!-- GB2312 "&#178;&#206;&#213;&#213;" -->
 
-<gentext key="ListofTables" text="&#x8868;&#x683C;&#x5217;&#x8868;"/>
-<gentext key="listoftables" text="&#x8868;&#x683C;&#x5217;&#x8868;"/> <!-- GB2312 "&#177;&#237;&#184;&#241;&#193;&#208;&#177;&#237;" -->
+<gentext key="ListofEquations" text="&#x65B9;&#x7A0B;&#x5F0F;&#x5217;&#x8868;"/>
+<gentext key="listofequations" text="&#x65B9;&#x7A0B;&#x5F0F;&#x5217;&#x8868;"/> <!-- GB2312 "&#183;&#189;&#179;&#204;&#202;&#189;&#193;&#208;&#177;&#237;" -->
 <gentext key="ListofExamples" text="&#x793A;&#x4F8B;&#x5217;&#x8868;"/>
 <gentext key="listofexamples" text="&#x793A;&#x4F8B;&#x5217;&#x8868;"/> <!-- GB2312 "&#202;&#190;&#192;&#253;&#193;&#208;&#177;&#237;" -->
 <gentext key="ListofFigures" text="&#x56FE;&#x5F62;&#x5217;&#x8868;"/>
 <gentext key="listoffigures" text="&#x56FE;&#x5F62;&#x5217;&#x8868;"/> <!-- GB2312 "&#205;&#188;&#208;&#206;&#193;&#208;&#177;&#237;" -->
-<gentext key="ListofEquations" text="&#x65B9;&#x7A0B;&#x5F0F;&#x5217;&#x8868;"/>
-<gentext key="listofequations" text="&#x65B9;&#x7A0B;&#x5F0F;&#x5217;&#x8868;"/> <!-- GB2312 "&#183;&#189;&#179;&#204;&#202;&#189;&#193;&#208;&#177;&#237;" -->
+<gentext key="ListofTables" text="&#x8868;&#x683C;&#x5217;&#x8868;"/>
+<gentext key="listoftables" text="&#x8868;&#x683C;&#x5217;&#x8868;"/> <!-- GB2312 "&#177;&#237;&#184;&#241;&#193;&#208;&#177;&#237;" -->
 <gentext key="ListofUnknown" text="&#x5176;&#x4ED6;&#x5185;&#x5BB9;&#x5217;&#x8868;"/>
 <gentext key="listofunknown" text="&#x5176;&#x4ED6;&#x5185;&#x5BB9;&#x5217;&#x8868;"/> <!-- GB2312 "&#198;&#228;&#203;&#251;&#196;&#218;&#200;&#221;&#193;&#208;&#177;&#237;" -->
 
+<gentext key="nav-home" text="&#x8D77;&#x70B9;"/> <!-- GB2312 "&#198;&#240;&#181;&#227;" -->
+<gentext key="nav-next" text="&#x524D;&#x8FDB;"/> <!-- GB2312 "&#199;&#176;&#189;&#248;" -->
+<gentext key="nav-next-sibling" text="&#x5FEB;&#x901F;&#x524D;&#x8FDB;"/> <!-- GB2312 "&#191;&#236;&#203;&#217;&#199;&#176;&#189;&#248;" -->
 <gentext key="nav-prev" text="&#x540E;&#x9000;"/> <!-- GB2312 "&#186;&#243;&#205;&#203;" -->
 <gentext key="nav-prev-sibling" text="&#x5FEB;&#x901F;&#x540E;&#x9000;"/> <!-- GB2312 "&#191;&#236;&#203;&#217;&#186;&#243;&#205;&#203;" -->
-<gentext key="nav-next-sibling" text="&#x5FEB;&#x901F;&#x524D;&#x8FDB;"/> <!-- GB2312 "&#191;&#236;&#203;&#217;&#199;&#176;&#189;&#248;" -->
-<gentext key="nav-next" text="&#x524D;&#x8FDB;"/> <!-- GB2312 "&#199;&#176;&#189;&#248;" -->
 <gentext key="nav-up" text="&#x4E0A;&#x4E00;&#x7EA7;"/> <!-- GB2312 "&#201;&#207;&#210;&#187;&#188;&#182;" -->
-<gentext key="nav-home" text="&#x8D77;&#x70B9;"/> <!-- GB2312 "&#198;&#240;&#181;&#227;" -->
 
 <dingbat key="startquote" text='"'/>
 <dingbat key="endquote" text='"'/>
@@ -353,9 +353,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>
diff --git a/gentext/locale/zh_tw.xml b/gentext/locale/zh_tw.xml
index b83b5b7cb..1967ef749 100644
--- a/gentext/locale/zh_tw.xml
+++ b/gentext/locale/zh_tw.xml
@@ -112,37 +112,37 @@
 
 <gentext key="TableofContents"
          text="&#x5167;&#x5BB9;&#x76EE;&#x9304;"/>
-<gentext key="in"             text="&#x5728;"/>
+<gentext key="and"            text="&#x4E14;"/>
 <gentext key="by"             text="&#x7531;"/>
 <gentext key="Edited"         text="&#x7DE8;&#x8F2F;"/>
 <gentext key="Editedby"       text="&#x7DE8;&#x8F2F;"/>
-<gentext key="and"            text="&#x4E14;"/>
-<gentext key="listcomma" text=","/>
+<gentext key="in"             text="&#x5728;"/>
 <gentext key="lastlistcomma" text=","/>
+<gentext key="listcomma" text=","/>
+<gentext key="nonexistantelement"
 <gentext key="Notes"          text="&#x6CE8;"/>
 <gentext key="TableNotes"     text="&#x6CE8;&#x91CB;"/>
-<gentext key="nonexistantelement"
          text="&#x4E0D;&#x5B58;&#x5728;&#x7684;&#x5143;&#x7D20;"/>
-<gentext key="Pgs"            text="&#x9801;"/>
 <gentext key="page.citation"  text="&#x9801;"/>
+<gentext key="Pgs"            text="&#x9801;"/>
+<gentext key="unexpectedelementname"
 <gentext key="unsupported"    text="&#x672A;&#x652F;&#x63F4;"/>
 <gentext key="xrefto"         text="&#x53C3;&#x7167;"/>
-<gentext key="unexpectedelementname"
          text="&#x975E;&#x9810;&#x671F;&#x7684;&#x5143;&#x7D20;&#x540D;"/>
 <gentext key="Revisedby"      text="&#x4FEE;&#x8A02;"/>
 
-<gentext key="ListofTables"   text="&#x9644;&#x8868;&#x76EE;&#x9304;"/>
+<gentext key="ListofEquations" text="&#x516C;&#x5F0F;&#x76EE;&#x9304;"/>
 <gentext key="ListofExamples" text="&#x7BC4;&#x4F8B;&#x76EE;&#x9304;"/>
 <gentext key="ListofFigures"  text="&#x9644;&#x5716;&#x76EE;&#x9304;"/>
-<gentext key="ListofEquations" text="&#x516C;&#x5F0F;&#x76EE;&#x9304;"/>
+<gentext key="ListofTables"   text="&#x9644;&#x8868;&#x76EE;&#x9304;"/>
 <gentext key="ListofUnknown"  text="&#x5176;&#x5B83;&#x5167;&#x5BB9;&#x76EE;&#x9304;"/>
 
+<gentext key="nav-home"         text="&#x5167;&#x5BB9;"/>
+<gentext key="nav-next"         text="&#x4E0B;&#x4E00;&#x9801;"/>
+<gentext key="nav-next-sibling" text="&#x5FEB;&#x901F;&#x5411;&#x5F8C;"/>
 <gentext key="nav-prev"       text="&#x524D;&#x4E00;&#x9801;"/>
 <gentext key="nav-prev-sibling" text="&#x5FEB;&#x901F;&#x5411;&#x524D;"/>
-<gentext key="nav-next-sibling" text="&#x5FEB;&#x901F;&#x5411;&#x5F8C;"/>
-<gentext key="nav-next"         text="&#x4E0B;&#x4E00;&#x9801;"/>
 <gentext key="nav-up"           text="&#x4E0A;&#x4E00;&#x5C64;"/>
-<gentext key="nav-home"         text="&#x5167;&#x5BB9;"/>
 
 <dingbat key="startquote"     text="&quot;"/>
 <dingbat key="endquote"       text="&quot;"/>
@@ -338,9 +338,9 @@
 </context>
 
 <context name="msgset">
+<template name="MsgAud"><MsgAud/>: </template>
 <template name="MsgLevel"><MsgLevel/>: </template>
 <template name="MsgOrig"><MsgOrig/>: </template>
-<template name="MsgAud"><MsgAud/>: </template>
 </context>
 
 </locale>