From owner-svn-src-user@FreeBSD.ORG  Mon Aug  3 21:39:04 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD1AE106566B;
	Mon,  3 Aug 2009 21:39:04 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A4FD8FC1A;
	Mon,  3 Aug 2009 21:39:04 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n73Ld4cs098055;
	Mon, 3 Aug 2009 21:39:04 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n73Ld46a098054;
	Mon, 3 Aug 2009 21:39:04 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908032139.n73Ld46a098054@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 3 Aug 2009 21:39:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196059 - user/edwin/locale/tools
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Aug 2009 21:39:04 -0000

Author: edwin
Date: Mon Aug  3 21:39:04 2009
New Revision: 196059
URL: http://svn.freebsd.org/changeset/base/196059

Log:
  - Add FreeBSD specific data (alternative month)
  - Temporary disable all translations to while redoing "iconv" routines.
  - Reformat to fit on 80 columns.

Modified:
  user/edwin/locale/tools/charmaps.xml

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Mon Aug  3 20:26:55 2009	(r196058)
+++ user/edwin/locale/tools/charmaps.xml	Mon Aug  3 21:39:04 2009	(r196059)
@@ -178,163 +178,172 @@
 
 <translations>
 	<!-- These don't have a special Euro sign so just use Eu for it -->
-	<translation encoding="ISO8859-1" cldr="EURO_SIGN" string="Eu" />
-	<translation encoding="ISO8859-2" cldr="EURO_SIGN" string="Eu" />
+	<translation encoding="ISO8859-1" cldr="EURO SIGN" string="Eu" />
+	<translation encoding="ISO8859-2" cldr="EURO SIGN" string="Eu" />
+
+	<!-- Minus and dashes -->
+	<translation encoding="ISO8859-1 ISO8859-4 ISO8859-13 ISO8859-15"
+	    cldr="MINUS SIGN" unicode="HYPHEN-MINUS" />
+	<translation encoding="ISO8859-2"
+	    cldr="EN DASH" unicode="HYPHEN-MINUS" />
+
+	<translation encoding="ISO8859-2"
+	    cldr="CYRILLIC SMALL LETTER DE" string="d" />
+
+</translations>
+
+<translationssss>
 
 	<!-- These don't have a special Kow sign so just use KRW for it -->
-	<translation encoding="CP949" cldr="WON_SIGN" hex="5C" />
-	<translation encoding="eucKR" cldr="WON_SIGN" hex="5C" />
+	<translation encoding="CP949" cldr="WON SIGN" hex="5C" />
+	<translation encoding="eucKR" cldr="WON SIGN" hex="5C" />
 
 	<!-- Minus and dashes -->
-	<translation encoding="ISO8859-1" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-4" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-13" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-15" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-2" cldr="EN_DASH" string="-" />
+	<translation encoding="ISO8859-2" cldr="EN DASH" string="-" />
 
 	<!-- Copied from the original FreeBSD src/share/monetdef -->
-	<translation encoding="CP1251" cldr="HRYVNIA_SIGN" hex="E3F0ED" />
-	<translation encoding="ISO8859-5" cldr="HRYVNIA_SIGN" hex="D3E0DD" />
-	<translation encoding="KOI8-U" cldr="HRYVNIA_SIGN" hex="C7D2CE" />
+	<translation encoding="CP1251" cldr="HRYVNIA SIGN" hex="E3F0ED" />
+	<translation encoding="ISO8859-5" cldr="HRYVNIA SIGN" hex="D3E0DD" />
+	<translation encoding="KOI8-U" cldr="HRYVNIA SIGN" hex="C7D2CE" />
 
 	<!-- Copied from the original FreeBSD src/share/timedef -->
 	<translation encoding="KOI8-R"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 	<translation encoding="KOI8-R"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 	<translation encoding="KOI8-R"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="E9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="E9" />
 
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="D8" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="D8" />
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="CA" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="CA" />
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="C4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="C4" />
 
 	<translation encoding="ISO8859-2"
-	    cldr="LATIN_SMALL_LETTER_N_WITH_ACUTE" hex="F1" />
+	    cldr="LATIN SMALL LETTER N WITH ACUTE" hex="F1" />
 	<translation encoding="ISO8859-2"
-	    cldr="LATIN_SMALL_LETTER_I_WITH_ACUTE" hex="ED" />
+	    cldr="LATIN SMALL LETTER I WITH ACUTE" hex="ED" />
 	<translation encoding="ISO8859-2" cldr="k" string="k" />
 
 	<translation encoding="ISO8859-4" cldr="s" string="s" />
 	<translation encoding="ISO8859-4"
-	    cldr="LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE" hex="EC" />
+	    cldr="LATIN SMALL LETTER E WITH DOT ABOVE" hex="EC" />
 
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="D9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="D9" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="D4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="D4" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_YERU" hex="EB" />
+	    cldr="CYRILLIC SMALL LETTER YERU" hex="EB" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="DA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="DA" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 
 	<translation encoding="ISO8859-7"
-	    cldr="GREEK_SMALL_LETTER_FINAL_SIGMA" hex="F2" />
+	    cldr="GREEK SMALL LETTER FINAL SIGMA" hex="F2" />
 
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_YERU" hex="FB" />
+	    cldr="CYRILLIC SMALL LETTER YERU" hex="FB" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="EA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="EA" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="FC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="FC" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="E9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="E9" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="E4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="E4" />
 
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_YERU" hex="EB" />
+	    cldr="CYRILLIC SMALL LETTER YERU" hex="EB" />
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="AA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="AA" />
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="A4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="A4" />
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 
 	<translation encoding="CP866"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 	<translation encoding="CP866"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="A9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="A9" />
 	<translation encoding="CP866"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_A" hex="E0" />
+	    cldr="CYRILLIC SMALL LETTER A" hex="E0" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_EM" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER EM" hex="EC" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_EN" hex="ED" />
+	    cldr="CYRILLIC SMALL LETTER EN" hex="ED" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_ER" hex="F0" />
+	    cldr="CYRILLIC SMALL LETTER ER" hex="F0" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_IE" hex="E5" />
+	    cldr="CYRILLIC SMALL LETTER IE" hex="E5" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="EA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="EA" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_ZE" hex="E7" />
+	    cldr="CYRILLIC SMALL LETTER ZE" hex="E7" />
 
 	<!-- Spaces from XX -->
-	<!-- translation encoding="US-ASCII" cldr="NO-BREAK_SPACE" string="XX" / -->
+	<!-- translation encoding="US-ASCII" cldr="NO-BREAK SPACE" string="XX" / -->
 
 	<!-- Value found in http://en.wikipedia.org/wiki/Pound_sign -->
-	<translation encoding="US-ASCII" cldr="POUND_SIGN" hex="A3" />
+	<translation encoding="US-ASCII" cldr="POUND SIGN" hex="A3" />
 
 	<!-- Values found in http://en.wikipedia.org/wiki/Ya_(Cyrillic) -->
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_YA" hex="FF" />
+	    cldr="CYRILLIC SMALL LETTER YA" hex="FF" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_YA" hex="EF" />
+	    cldr="CYRILLIC SMALL LETTER YA" hex="EF" />
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_YA" hex="D1" />
+	    cldr="CYRILLIC SMALL LETTER YA" hex="D1" />
 
 	<!-- Values found in
 		http://en.wikipedia.org/wiki/Cyrillic_characters_in_Unicode
 	 -->
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_A" string="A" />
+	    cldr="CYRILLIC CAPITAL LETTER A" string="A" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_A" string="a" />
+	    cldr="CYRILLIC SMALL LETTER A" string="a" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" string="k" />
+	    cldr="CYRILLIC SMALL LETTER KA" string="k" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_O" string="o" />
+	    cldr="CYRILLIC SMALL LETTER O" string="o" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_DE" string="D" />
+	    cldr="CYRILLIC CAPITAL LETTER DE" string="D" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" string="d" />
+	    cldr="CYRILLIC SMALL LETTER DE" string="d" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_IE" string="E" />
+	    cldr="CYRILLIC CAPITAL LETTER IE" string="E" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_IE" string="e" />
+	    cldr="CYRILLIC SMALL LETTER IE" string="e" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_EN" string="N" />
+	    cldr="CYRILLIC CAPITAL LETTER EN" string="N" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_EN" string="n" />
+	    cldr="CYRILLIC SMALL LETTER EN" string="n" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_BE" string="b" />
+	    cldr="CYRILLIC SMALL LETTER BE" string="b" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_ER" string="r" />
+	    cldr="CYRILLIC SMALL LETTER ER" string="r" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_JE" string="j" />
+	    cldr="CYRILLIC SMALL LETTER JE" string="j" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_EL" string="l" />
+	    cldr="CYRILLIC SMALL LETTER EL" string="l" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_GHE" string="g" />
+	    cldr="CYRILLIC SMALL LETTER GHE" string="g" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_PE" string="p" />
+	    cldr="CYRILLIC SMALL LETTER PE" string="p" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" string="t" />
+	    cldr="CYRILLIC SMALL LETTER TE" string="t" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_VE" string="v" />
+	    cldr="CYRILLIC SMALL LETTER VE" string="v" />
 
 	<!-- Not sure why these ones aren't known by libiconv -->
 	<translation encoding="ISO8859-2" cldr="a" string="a" />
@@ -348,10 +357,10 @@
 	<translation encoding="ISO8859-5" cldr="k" string="k" />
 
 	<!-- Just a . ? -->
-	<translation encoding="ISO8859-2" cldr="FULL_STOP" string="." />
-	<translation encoding="ARMSCII-8" cldr="ONE_DOT_LEADER" string="." />
+	<translation encoding="ISO8859-2" cldr="FULL STOP" string="." />
+	<translation encoding="ARMSCII-8" cldr="ONE DOT LEADER" string="." />
 
-</translations>
+</translationssss>
 
 <alternativemonths>
 	<!-- Months which are different in dates ("21 december 1980") and in
@@ -362,66 +371,66 @@
 	  -->
 	<language name="be" countries="BY">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_ZE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_YERU>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_DE>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>"
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER ZE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER YERU>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER DE>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>"
 		]]>
 	</language>
 	<language name="cs" countries="CZ">
 		<![CDATA[
 		"<l><e><d><e><n>";
-		"<LATIN_SMALL_LETTER_U_WITH_ACUTE><n><o><r>";
-		"<b><LATIN_SMALL_LETTER_R_WITH_CARON><e><z><e><n>";
+		"<LATIN SMALL LETTER U WITH ACUTE><n><o><r>";
+		"<b><LATIN SMALL LETTER R WITH CARON><e><z><e><n>";
 		"<d><u><b><e><n>";
-		"<k><v><LATIN_SMALL_LETTER_E_WITH_CARON><t><e><n>";
-		"<LATIN_SMALL_LETTER_C_WITH_CARON><e><r><v><e><n>";
-		"<LATIN_SMALL_LETTER_C_WITH_CARON><e><r><v><e><n><e><c>";
+		"<k><v><LATIN SMALL LETTER E WITH CARON><t><e><n>";
+		"<LATIN SMALL LETTER C WITH CARON><e><r><v><e><n>";
+		"<LATIN SMALL LETTER C WITH CARON><e><r><v><e><n><e><c>";
 		"<s><r><p><e><n>";
-		"<z><LATIN_SMALL_LETTER_A_WITH_ACUTE><LATIN_SMALL_LETTER_R_WITH_CARON><LATIN_SMALL_LETTER_I_WITH_ACUTE>";
-		"<LATIN_SMALL_LETTER_R_WITH_CARON><LATIN_SMALL_LETTER_I_WITH_ACUTE><j><e><n>";
+		"<z><LATIN SMALL LETTER A WITH ACUTE><LATIN SMALL LETTER R WITH CARON><LATIN SMALL LETTER I WITH ACUTE>";
+		"<LATIN SMALL LETTER R WITH CARON><LATIN SMALL LETTER I WITH ACUTE><j><e><n>";
 		"<l><i><s><t><o><p><a><d>";
 		"<p><r><o><s><i><n><e><c>"
 		]]>
 	</language>
 	<language name="el" countries="GR">
 		<![CDATA[
-		"<GREEK_CAPITAL_LETTER_IOTA><GREEK_SMALL_LETTER_ALPHA><GREEK_SMALL_LETTER_NU><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_PHI><GREEK_SMALL_LETTER_EPSILON><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_MU><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_ALPHA><GREEK_SMALL_LETTER_PI><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA_WITH_TONOS><GREEK_SMALL_LETTER_LAMDA><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_MU><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_IOTA_WITH_DIALYTIKA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON_WITH_TONOS><GREEK_SMALL_LETTER_NU><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON_WITH_TONOS><GREEK_SMALL_LETTER_LAMDA><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_ALPHA><GREEK_SMALL_LETTER_UPSILON_WITH_TONOS><GREEK_SMALL_LETTER_GAMMA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON><GREEK_SMALL_LETTER_SIGMA><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_SIGMA><GREEK_SMALL_LETTER_EPSILON><GREEK_SMALL_LETTER_PI><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_EPSILON_WITH_TONOS><GREEK_SMALL_LETTER_MU><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_OMICRON><GREEK_SMALL_LETTER_KAPPA><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_OMEGA_WITH_TONOS><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_NU><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_EPSILON_WITH_TONOS><GREEK_SMALL_LETTER_MU><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_DELTA><GREEK_SMALL_LETTER_EPSILON><GREEK_SMALL_LETTER_KAPPA><GREEK_SMALL_LETTER_EPSILON_WITH_TONOS><GREEK_SMALL_LETTER_MU><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>"
+		"<GREEK CAPITAL LETTER IOTA><GREEK SMALL LETTER ALPHA><GREEK SMALL LETTER NU><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER PHI><GREEK SMALL LETTER EPSILON><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER MU><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER RHO><GREEK SMALL LETTER TAU><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER ALPHA><GREEK SMALL LETTER PI><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA WITH TONOS><GREEK SMALL LETTER LAMDA><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER MU><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER IOTA WITH DIALYTIKA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON WITH TONOS><GREEK SMALL LETTER NU><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON WITH TONOS><GREEK SMALL LETTER LAMDA><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER ALPHA><GREEK SMALL LETTER UPSILON WITH TONOS><GREEK SMALL LETTER GAMMA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON><GREEK SMALL LETTER SIGMA><GREEK SMALL LETTER TAU><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER SIGMA><GREEK SMALL LETTER EPSILON><GREEK SMALL LETTER PI><GREEK SMALL LETTER TAU><GREEK SMALL LETTER EPSILON WITH TONOS><GREEK SMALL LETTER MU><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER OMICRON><GREEK SMALL LETTER KAPPA><GREEK SMALL LETTER TAU><GREEK SMALL LETTER OMEGA WITH TONOS><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER NU><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER EPSILON WITH TONOS><GREEK SMALL LETTER MU><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER DELTA><GREEK SMALL LETTER EPSILON><GREEK SMALL LETTER KAPPA><GREEK SMALL LETTER EPSILON WITH TONOS><GREEK SMALL LETTER MU><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>"
 		]]>
 	</language>
 	<language name="kk" countries="KZ">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN>";
-		"<CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ZE>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_SCHWA><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_EM>";
-		"<CYRILLIC_SMALL_LETTER_SHA><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_IE>";
-		"<CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ZE>";
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_SHORT_I><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ZE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN>";
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_SHA><CYRILLIC_SMALL_LETTER_A>";
-		"<CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN>"
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN>";
+		"<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ZE>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER SCHWA><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER EM>";
+		"<CYRILLIC SMALL LETTER SHA><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER IE>";
+		"<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ZE>";
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER SHORT I><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ZE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN>";
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER SHA><CYRILLIC SMALL LETTER A>";
+		"<CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN>"
 		]]>
 	</language>
 	<language name="lt" countries="LT">
@@ -430,11 +439,11 @@
 		"<v><a><s><a><r><i><s>";
 		"<k><o><v><a><s>";
 		"<b><a><l><a><n><d><i><s>";
-		"<g><e><g><u><LATIN_SMALL_LETTER_Z_WITH_CARON><LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE>";
-		"<b><i><r><LATIN_SMALL_LETTER_Z_WITH_CARON><e><l><i><s>";
+		"<g><e><g><u><LATIN SMALL LETTER Z WITH CARON><LATIN SMALL LETTER E WITH DOT ABOVE>";
+		"<b><i><r><LATIN SMALL LETTER Z WITH CARON><e><l><i><s>";
 		"<l><i><e><p><a>";
-		"<r><u><g><p><j><LATIN_SMALL_LETTER_U_WITH_MACRON><t><i><s>";
-		"<r><u><g><s><LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE><j><i><s>";
+		"<r><u><g><p><j><LATIN SMALL LETTER U WITH MACRON><t><i><s>";
+		"<r><u><g><s><LATIN SMALL LETTER E WITH DOT ABOVE><j><i><s>";
 		"<s><p><a><l><i><s>";
 		"<l><a><p><k><r><i><t><i><s>";
 		"<g><r><u><o><d><i><s>"
@@ -442,66 +451,66 @@
 	</language>
 	<language name="mn" countries="MN">
 		<![CDATA[
-		"<CYRILLIC_CAPITAL_LETTER_EN><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_HA><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_IO><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_GHE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_DE><CYRILLIC_SMALL_LETTER_BARRED_O><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_BARRED_O><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_ZE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_DE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_EN><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_SHORT_I><CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_IE><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><space><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><space><CYRILLIC_SMALL_LETTER_HA><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_IO><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>"
+		"<CYRILLIC CAPITAL LETTER EN><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER HA><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER IO><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER GHE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER DE><CYRILLIC SMALL LETTER BARRED O><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER BARRED O><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER ZE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER DE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER EN><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER SHORT I><CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER IE><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><space><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><space><CYRILLIC SMALL LETTER HA><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER IO><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>"
 		]]>
 	</language>
 	<language name="pl" countries="PL">
 		<![CDATA[
-		"<s><t><y><c><z><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
+		"<s><t><y><c><z><e><LATIN SMALL LETTER N WITH ACUTE>";
 		"<l><u><t><y>";
 		"<m><a><r><z><e><c>";
-		"<k><w><i><e><c><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
+		"<k><w><i><e><c><i><e><LATIN SMALL LETTER N WITH ACUTE>";
 		"<m><a><j>";
 		"<c><z><e><r><w><i><e><c>";
 		"<l><i><p><i><e><c>";
-		"<s><i><e><r><p><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
-		"<w><r><z><e><s><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
-		"<p><a><LATIN_SMALL_LETTER_Z_WITH_ACUTE><d><z><i><e><r><n><i><k>";
+		"<s><i><e><r><p><i><e><LATIN SMALL LETTER N WITH ACUTE>";
+		"<w><r><z><e><s><i><e><LATIN SMALL LETTER N WITH ACUTE>";
+		"<p><a><LATIN SMALL LETTER Z WITH ACUTE><d><z><i><e><r><n><i><k>";
 		"<l><i><s><t><o><p><a><d>";
-		"<g><r><u><d><z><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>"
+		"<g><r><u><d><z><i><e><LATIN SMALL LETTER N WITH ACUTE>"
 		]]>
 	</language>
 	<language name="ru" countries="RU">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EF><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_TE>";
-		"<CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_SHORT_I>";
-		"<CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>"
+		"<CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EF><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER TE>";
+		"<CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER SHORT I>";
+		"<CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>"
 		]]>
 	</language>
 	<language name="uk" countries="UA">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_SHORT_I>";
-		"<CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ZE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_DE>";
-		"<CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>"
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER SHORT I>";
+		"<CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ZE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER DE>";
+		"<CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>"
 		]]>
 	</language>