Update ICU to 64-2-rc
- Support new Japanese Era (952305)
- Update to Unicode 12.1
- Fix undefined U_DISABLE_VERSION_SUFFIX warning (949962)
For more detail, see
http://site.icu-project.org/download/64
Also
- Fix Fuzzer bug of RegExp breakage (949885)
Bug: 952305, 949962, 949885, 952305
Change-Id: I32616f805c0d824b80786b502d96a13c201e15b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/icu/+/1566439
Reviewed-by: Jungshik Shin <jshin@chromium.org>
diff --git a/APIChangeReport.html b/APIChangeReport.html
index 5fd720d..0483c43 100644
--- a/APIChangeReport.html
+++ b/APIChangeReport.html
@@ -5,12 +5,12 @@
-->
<head>
<META http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>ICU4C API Comparison: ICU 63 with ICU 64</title>
+<title>ICU4C API Comparison: ICU 63 with ICU 64 (update #1: 64.2)</title>
<link type="text/css" href="icu4c.css" rel="stylesheet">
</head>
<body>
<a name="#_top"></a>
-<h1>ICU4C API Comparison: ICU 63 with ICU 64</h1>
+<h1>ICU4C API Comparison: ICU 63 with ICU 64 (update #1: 64.2)</h1>
<div id="toc">
<ul>
<li>
@@ -94,6 +94,10 @@
<span class=""><span></span></span></td>
</tr>
<tr class="row1">
+<td class="file">numsys.h</td><td class="proto"><tt>#define</tt> NUMSYS_NAME_CAPACITY</td><td class="">Internal</td><td>(missing)<br>
+<span class=""><span></span></span></td>
+</tr>
+<tr class="row0">
<td class="file">unistr.h</td><td class="proto">UnicodeString& icu::UnicodeString::moveFrom(UnicodeString&)</td><td class="">Draft<br>ICU 56</td><td>(missing)<br>
<span class=""><span></span></span></td>
</tr>
@@ -2527,7 +2531,7 @@
<a href="#_top">(jump back to top)</a>
<hr>
<p>
-<i><font size="-1">Contents generated by StableAPI tool on Sun Mar 24 10:57:24 PDT 2019<br>Copyright (C) 2019, International Business Machines Corporation, All Rights Reserved.</font></i>
+<i><font size="-1">Contents generated by StableAPI tool on Fri Apr 05 10:36:27 PDT 2019<br>Copyright (C) 2019, International Business Machines Corporation, All Rights Reserved.</font></i>
</p>
</body>
</html>
diff --git a/README.chromium b/README.chromium
index a91c738..593c568 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,15 +1,15 @@
Name: icu
URL: https://github.com/unicode-org/icu
-Version: 64.1
+Version: 64.2-rc
License: MIT
Security Critical: yes
Description:
-This directory contains the source code of ICU 64.1 for C/C++.
+This directory contains the source code of ICU 64.2-rc for C/C++.
A. How to update ICU
-1. Run "scripts/update.sh <version>" (e.g. 64-1).
+1. Run "scripts/update.sh <version>" (e.g. 64-2-rc).
This will download ICU from the upstream git repository.
It does preserve Chrome-specific build files and
converter files. (see section C)
@@ -243,3 +243,12 @@
- patches/iso2022jp.patch
- upstream bug:
https://unicode-org.atlassian.net/browse/ICU-20251
+
+8. Regexp fuzzer breakage patch
+
+ - patches/regexp.patch
+ - upstream bug:
+ https://unicode-org.atlassian.net/browse/ICU-20544
+ - upstream PR:
+ https://github.com/unicode-org/icu/pull/611
+ https://github.com/unicode-org/icu/pull/623
diff --git a/android/icudtl.dat b/android/icudtl.dat
index e925f45..cc8bd71 100644
--- a/android/icudtl.dat
+++ b/android/icudtl.dat
Binary files differ
diff --git a/android_small/icudtl.dat b/android_small/icudtl.dat
index 7340d84..dd9061b 100644
--- a/android_small/icudtl.dat
+++ b/android_small/icudtl.dat
Binary files differ
diff --git a/cast/icudtl.dat b/cast/icudtl.dat
index ea75a71..f2b2e12 100644
--- a/cast/icudtl.dat
+++ b/cast/icudtl.dat
Binary files differ
diff --git a/chromeos/icudtl.dat b/chromeos/icudtl.dat
index 244acdb..769a47c 100644
--- a/chromeos/icudtl.dat
+++ b/chromeos/icudtl.dat
Binary files differ
diff --git a/common/icudtb.dat b/common/icudtb.dat
index a9c8197..1b1b5bb 100644
--- a/common/icudtb.dat
+++ b/common/icudtb.dat
Binary files differ
diff --git a/common/icudtl.dat b/common/icudtl.dat
index 75ffdb7..8537a54 100644
--- a/common/icudtl.dat
+++ b/common/icudtl.dat
Binary files differ
diff --git a/flutter/icudtl.dat b/flutter/icudtl.dat
index 4bf7e93..284f51c 100644
--- a/flutter/icudtl.dat
+++ b/flutter/icudtl.dat
Binary files differ
diff --git a/ios/icudtl.dat b/ios/icudtl.dat
index f7d8245..3fb26aa 100644
--- a/ios/icudtl.dat
+++ b/ios/icudtl.dat
Binary files differ
diff --git a/patches/regexp.patch b/patches/regexp.patch
new file mode 100644
index 0000000..549c8f2
--- /dev/null
+++ b/patches/regexp.patch
@@ -0,0 +1,22 @@
+diff --git a/source/i18n/regexcmp.cpp b/source/i18n/regexcmp.cpp
+index 2d14aa83..e27c3ca5 100644
+--- a/source/i18n/regexcmp.cpp
++++ b/source/i18n/regexcmp.cpp
+@@ -2285,7 +2285,7 @@ void RegexCompile::handleCloseParen() {
+ error(U_REGEX_LOOK_BEHIND_LIMIT);
+ break;
+ }
+- if (minML == INT32_MAX && maxML == 0) {
++ if (minML == INT32_MAX) {
+ // This condition happens when no match is possible, such as with a
+ // [set] expression containing no elements.
+ // In principle, the generated code to evaluate the expression could be deleted,
+@@ -2328,7 +2328,7 @@ void RegexCompile::handleCloseParen() {
+ error(U_REGEX_LOOK_BEHIND_LIMIT);
+ break;
+ }
+- if (minML == INT32_MAX && maxML == 0) {
++ if (minML == INT32_MAX) {
+ // This condition happens when no match is possible, such as with a
+ // [set] expression containing no elements.
+ // In principle, the generated code to evaluate the expression could be deleted,
diff --git a/readme.html b/readme.html
index 41d2903..f55c6b5 100644
--- a/readme.html
+++ b/readme.html
@@ -3,7 +3,7 @@
<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
- <title>ReadMe for ICU 64.1</title>
+ <title>ReadMe for ICU 64.2</title>
<meta name="COPYRIGHT" content=
"Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html"/>
<!-- meta name="COPYRIGHT" content=
@@ -32,7 +32,7 @@
International Components for Unicode<br/>
<span class="only-rc">Release Candidate</span>
<span class="only-milestone">(Milestone Release)</span>
- <abbr title="International Components for Unicode">ICU</abbr> 64.1 ReadMe
+ <abbr title="International Components for Unicode">ICU</abbr> 64.2 ReadMe
</h1>
<!-- Shouldn't need to comment/uncomment this paragraph, just change the body class -->
@@ -44,7 +44,7 @@
<p class="note only-rc">This is a release candidate version of ICU4C.
It is not recommended for production use.</p>
- <p>Last updated: 2019-Mar-18<br/>
+ <p>Last updated: 2019-Apr-04<br/>
Copyright © 2016 and later: Unicode, Inc. and others. License & terms of use:
<a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a><br/>
Copyright © 1997-2016 International Business Machines Corporation and others.
diff --git a/source/common/localsvc.h b/source/common/localsvc.h
index 60d447c..3364019 100644
--- a/source/common/localsvc.h
+++ b/source/common/localsvc.h
@@ -12,7 +12,7 @@
#include "unicode/utypes.h"
-#if U_LOCAL_SERVICE_HOOK
+#if defined(U_LOCAL_SERVICE_HOOK) && U_LOCAL_SERVICE_HOOK
/**
* Prototype for user-supplied service hook. This function is expected to return
* a type of factory object specific to the requested service.
diff --git a/source/common/norm2_nfc_data.h b/source/common/norm2_nfc_data.h
index d9d7140..c04bdac 100644
--- a/source/common/norm2_nfc_data.h
+++ b/source/common/norm2_nfc_data.h
@@ -12,7 +12,7 @@
#ifdef INCLUDED_FROM_NORMALIZER2_CPP
static const UVersionInfo norm2_nfc_data_formatVersion={4,0,0,0};
-static const UVersionInfo norm2_nfc_data_dataVersion={0xc,0,0,0};
+static const UVersionInfo norm2_nfc_data_dataVersion={0xc,1,0,0};
static const int32_t norm2_nfc_data_indexes[Normalizer2Impl::IX_COUNT]={
0x50,0x4ae0,0x8738,0x8838,0x8838,0x8838,0x8838,0x8838,0xc0,0x300,0xadc,0x29d0,0x3c56,0xfc00,0x1282,0x3b8c,
diff --git a/source/common/rbbi.cpp b/source/common/rbbi.cpp
index 3c2f720..3b116ff 100644
--- a/source/common/rbbi.cpp
+++ b/source/common/rbbi.cpp
@@ -30,6 +30,7 @@
#include "ucln_cmn.h"
#include "cmemory.h"
#include "cstring.h"
+#include "localsvc.h"
#include "rbbidata.h"
#include "rbbi_cache.h"
#include "rbbirb.h"
@@ -37,11 +38,6 @@
#include "umutex.h"
#include "uvectr32.h"
-// if U_LOCAL_SERVICE_HOOK is defined, then localsvc.cpp is expected to be included.
-#if U_LOCAL_SERVICE_HOOK
-#include "localsvc.h"
-#endif
-
#ifdef RBBI_DEBUG
static UBool gTrace = FALSE;
#endif
diff --git a/source/common/ubidi_props_data.h b/source/common/ubidi_props_data.h
index 97ba1e5..7008389 100644
--- a/source/common/ubidi_props_data.h
+++ b/source/common/ubidi_props_data.h
@@ -11,7 +11,7 @@
#ifdef INCLUDED_FROM_UBIDI_PROPS_C
-static const UVersionInfo ubidi_props_dataVersion={0xc,0,0,0};
+static const UVersionInfo ubidi_props_dataVersion={0xc,1,0,0};
static const int32_t ubidi_props_indexes[UBIDI_IX_TOP]={0x10,0x663c,0x6058,0x28,0x620,0x8c0,0x10ac0,0x10d24,0,0,0,0,0,0,0,0x6502b6};
diff --git a/source/common/ubidiwrt.cpp b/source/common/ubidiwrt.cpp
index a89099d..aa4d6b5 100644
--- a/source/common/ubidiwrt.cpp
+++ b/source/common/ubidiwrt.cpp
@@ -40,7 +40,7 @@
* Further assumptions for all UTFs:
* - u_charMirror(c) needs the same number of code units as c
*/
-#if UTF_SIZE==8
+#if defined(UTF_SIZE) && UTF_SIZE==8
# error reimplement ubidi_writeReordered() for UTF-8, see comment above
#endif
diff --git a/source/common/ucase_props_data.h b/source/common/ucase_props_data.h
index 0754737..68554b3 100644
--- a/source/common/ucase_props_data.h
+++ b/source/common/ucase_props_data.h
@@ -11,7 +11,7 @@
#ifdef INCLUDED_FROM_UCASE_CPP
-static const UVersionInfo ucase_props_dataVersion={0xc,0,0,0};
+static const UVersionInfo ucase_props_dataVersion={0xc,1,0,0};
static const int32_t ucase_props_indexes[UCASE_IX_TOP]={0x10,0x6fea,0x5fb8,0x687,0x172,0,0,0,0,0,0,0,0,0,0,3};
diff --git a/source/common/uchar_props_data.h b/source/common/uchar_props_data.h
index 94005d2..10c25b3 100644
--- a/source/common/uchar_props_data.h
+++ b/source/common/uchar_props_data.h
@@ -11,7 +11,7 @@
#ifdef INCLUDED_FROM_UCHAR_C
-static const UVersionInfo dataVersion={0xc,0,0,0};
+static const UVersionInfo dataVersion={0xc,1,0,0};
static const uint16_t propsTrie_index[21968]={
0x45d,0x465,0x46d,0x475,0x48d,0x495,0x49d,0x4a5,0x4ad,0x4b5,0x4bb,0x4c3,0x4cb,0x4d3,0x4db,0x4e3,
@@ -39,7 +39,7 @@
0x555,0xb34,0xb2c,0xb3c,0x4ad,0x4ad,0x4ad,0xb44,0x4fd,0xb4c,0x5c8,0xb52,0xb62,0xb5a,0xb5a,0x524,
0xb6a,0xb72,0xb7a,0x47d,0xb82,0x8fe,0x8fe,0xb89,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0xb91,0xb97,
0xba7,0xb9f,0x609,0x5c8,0xbaf,0x85a,0x5c8,0xbb7,0xbbf,0xbc3,0x5c8,0x5c8,0xbc8,0xbd0,0x8fe,0xbd8,
-0xaa3,0xbe0,0xbe6,0x8fe,0xbe0,0xbee,0x8fe,0xaa3,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,
+0xaa3,0xbe0,0xbe6,0x8fe,0xbe0,0xbee,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,0x8fe,
0xbf6,0x5c8,0x5c8,0x5c8,0xbfe,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,
0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,
0x5c8,0xc04,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,0x5c8,
@@ -1404,137 +1404,137 @@
NULL, 0, FALSE, FALSE, 0, NULL
};
-static const uint16_t propsVectorsTrie_index[30604]={
+static const uint16_t propsVectorsTrie_index[30588]={
0x4d6,0x4de,0x4e6,0x4ee,0x506,0x50e,0x516,0x51e,0x526,0x52e,0x536,0x53e,0x546,0x54e,0x556,0x55e,
0x565,0x56d,0x575,0x57d,0x580,0x588,0x590,0x598,0x5a0,0x5a8,0x5b0,0x5b8,0x5c0,0x5c8,0x5d0,0x5d8,
0x5e0,0x5e8,0x5ef,0x5f7,0x5ff,0x607,0x60f,0x617,0x61f,0x627,0x62c,0x634,0x63b,0x643,0x64b,0x653,
0x65b,0x663,0x66b,0x673,0x67a,0x682,0x68a,0x692,0x69a,0x6a2,0x6aa,0x6b2,0x6ba,0x6c2,0x6ca,0x6d2,
-0x19e8,0xd4b,0xe32,0x6da,0x4f6,0xe99,0xea1,0x1b92,0x12bf,0x12cf,0x12b7,0x12c7,0x7a3,0x7a9,0x7b1,0x7b9,
+0x19e4,0xd43,0xe2a,0x6da,0x4f6,0xe91,0xe99,0x1b8e,0x12b7,0x12c7,0x12af,0x12bf,0x7a3,0x7a9,0x7b1,0x7b9,
0x7c1,0x7c7,0x7cf,0x7d7,0x7df,0x7e5,0x7ed,0x7f5,0x7fd,0x803,0x80b,0x813,0x81b,0x823,0x82b,0x832,
-0x83a,0x840,0x848,0x850,0x858,0x85e,0x866,0x86e,0x876,0x12d7,0x87e,0x886,0x88e,0x895,0x89d,0x8a5,
-0x8ad,0x8b1,0x8b9,0x8c0,0x8c8,0x8d0,0x8d8,0x8e0,0x15e7,0x15ef,0x8e8,0x8f0,0x8f8,0x900,0x908,0x90f,
-0x164d,0x163d,0x1645,0x1923,0x192b,0x12e7,0x917,0x12df,0x1531,0x1531,0x1533,0x12fb,0x12fc,0x12ef,0x12f1,0x12f3,
-0x1655,0x1657,0x91f,0x1657,0x927,0x92c,0x934,0x165c,0x93a,0x1657,0x940,0x948,0xc27,0x1664,0x1664,0x950,
-0x1674,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,0x1675,
-0x1675,0x1675,0x1675,0x166c,0x958,0x167d,0x167d,0x960,0xb47,0xb4f,0xb57,0xb5f,0x168d,0x1685,0x968,0x970,
-0x978,0x1697,0x169f,0x980,0x1695,0x988,0x19f0,0xd53,0xb67,0xb6f,0xb77,0xb7c,0x1891,0xc5a,0xc61,0x17f9,
-0xbf7,0x19f8,0xd5b,0xd63,0xd6b,0xd73,0xf4c,0xf4c,0x18e9,0x18ee,0xc95,0xc9d,0x195f,0x1967,0x1ab1,0xe3a,
-0x196f,0xcdf,0xce7,0x1977,0x1109,0x11b1,0xf2c,0xd7b,0x1819,0x1801,0x1811,0x1809,0x18a9,0x18a1,0x1869,0xc07,
-0x1304,0x1304,0x1304,0x1304,0x1307,0x1304,0x1304,0x130f,0x990,0x1317,0x994,0x99c,0x1317,0x9a4,0x9ac,0x9b4,
-0x1327,0x131f,0x132f,0x9bc,0x9c4,0x1337,0x9cc,0x9d4,0x133f,0x1347,0x134f,0x1357,0x9dc,0x135f,0x1366,0x136e,
-0x1376,0x137e,0x1386,0x138e,0x1396,0x139d,0x13a5,0x13ad,0x13b5,0x13bd,0x13c0,0x13c2,0x16a7,0x178c,0x1792,0x18d9,
-0x13ca,0x9e4,0x9ec,0x14e4,0x14e9,0x14ec,0x14f4,0x13d2,0x14fc,0x14fc,0x13e2,0x13da,0x13ea,0x13f2,0x13fa,0x1402,
-0x140a,0x1412,0x141a,0x1422,0x179a,0x17f1,0x1933,0x1a89,0x1432,0x1439,0x1441,0x1449,0x142a,0x1451,0x17a2,0x17a9,
-0x16af,0x16af,0x16af,0x16af,0x16af,0x16af,0x16af,0x16af,0x17b1,0x17b4,0x17b1,0x17b1,0x17bc,0x17c3,0x17c5,0x17cc,
-0x17d4,0x17d8,0x17d8,0x17db,0x17d8,0x17d8,0x17e1,0x17d8,0x1821,0x18e1,0x193b,0xb84,0xb8a,0x1bce,0x1bd6,0x1cad,
-0x1881,0xc37,0xc3b,0x18f6,0x1871,0x1871,0x1871,0xc0f,0x1879,0xc2f,0x18c1,0xc85,0xc17,0xc1f,0xc1f,0x197f,
-0x18b1,0x1943,0xc71,0xc75,0x9f4,0x16b7,0x16b7,0x9fc,0x16bf,0x16bf,0x16bf,0x16bf,0x16bf,0x16bf,0xa04,0x6de,
-0x1519,0x153b,0xa0c,0x1543,0xa14,0x154b,0x1553,0x155b,0xa1c,0xa21,0x1563,0x156a,0xa26,0xa2e,0x18d1,0xbff,
-0xa36,0x15c1,0x15c8,0x1572,0x15d0,0x15d7,0x157a,0xa3e,0x1593,0x1593,0x1595,0x1582,0x158a,0x158a,0x158b,0x15df,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,
-0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x16c7,0x126c,0x1829,0x1829,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,
-0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x159d,0x15a4,0x19e0,0x1274,
-0x16cf,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,
-0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,0x16d5,
-0x16d5,0x16d5,0x16d5,0x16d5,0xa46,0x16dd,0xa4e,0x1a00,0x198b,0x198b,0x198b,0x198b,0x198b,0x198b,0x198b,0x198b,
-0x1987,0xcef,0x199b,0x1993,0x199d,0x1a08,0x1a08,0xd83,0x1889,0x18fe,0x1953,0x1957,0x194b,0x1aa9,0xca5,0xca8,
-0x18b9,0xc7d,0x1906,0xcb0,0x19a5,0x19a8,0xcf7,0x1a10,0x19b8,0x19b0,0xcff,0xd8b,0x1a18,0x1a1c,0xd93,0xff4,
-0x19c0,0xd07,0xd0f,0x1a24,0x1a34,0x1a2c,0xd9b,0xef4,0xe42,0xe4a,0x1c1d,0xfac,0x1cca,0x1cca,0x1a3c,0xda3,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,
-0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,
-0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,
-0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,
-0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,
-0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,
-0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,
-0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,
-0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,
-0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,
-0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,
-0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,
-0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,
-0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,
-0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,
-0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,
-0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,
-0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,
-0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,
-0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0x1635,0x162f,0x1630,0x1631,0x1632,0x1633,0x1634,0xa56,0xdab,0xdae,
+0x83a,0x840,0x848,0x850,0x858,0x85e,0x866,0x86e,0x876,0x12cf,0x87e,0x886,0x88e,0x895,0x89d,0x8a5,
+0x8ad,0x8b1,0x8b9,0x8c0,0x8c8,0x8d0,0x8d8,0x8e0,0x15e3,0x15eb,0x8e8,0x8f0,0x8f8,0x900,0x908,0x90f,
+0x1649,0x1639,0x1641,0x191f,0x1927,0x12df,0x917,0x12d7,0x1529,0x1529,0x152b,0x12f3,0x12f4,0x12e7,0x12e9,0x12eb,
+0x1651,0x1653,0x91f,0x1653,0x927,0x92c,0x934,0x1658,0x93a,0x1653,0x940,0x948,0xc1f,0x1660,0x1660,0x950,
+0x1670,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,0x1671,
+0x1671,0x1671,0x1671,0x1668,0x958,0x1679,0x1679,0x960,0xb3f,0xb47,0xb4f,0xb57,0x1689,0x1681,0x968,0x970,
+0x978,0x1693,0x169b,0x980,0x1691,0x988,0x19ec,0xd4b,0xb5f,0xb67,0xb6f,0xb74,0x188d,0xc52,0xc59,0x17f5,
+0xbef,0x19f4,0xd53,0xd5b,0xd63,0xd6b,0xf44,0xf44,0x18e5,0x18ea,0xc8d,0xc95,0x195b,0x1963,0x1aad,0xe32,
+0x196b,0xcd7,0xcdf,0x1973,0x1101,0x11a9,0xf24,0xd73,0x1815,0x17fd,0x180d,0x1805,0x18a5,0x189d,0x1865,0xbff,
+0x12fc,0x12fc,0x12fc,0x12fc,0x12ff,0x12fc,0x12fc,0x1307,0x990,0x130f,0x994,0x99c,0x130f,0x9a4,0x9ac,0x9b4,
+0x131f,0x1317,0x1327,0x9bc,0x9c4,0x132f,0x9cc,0x9d4,0x1337,0x133f,0x1347,0x134f,0x9dc,0x1357,0x135e,0x1366,
+0x136e,0x1376,0x137e,0x1386,0x138e,0x1395,0x139d,0x13a5,0x13ad,0x13b5,0x13b8,0x13ba,0x16a3,0x1788,0x178e,0x18d5,
+0x13c2,0x9e4,0x9ec,0x14dc,0x14e1,0x14e4,0x14ec,0x13ca,0x14f4,0x14f4,0x13da,0x13d2,0x13e2,0x13ea,0x13f2,0x13fa,
+0x1402,0x140a,0x1412,0x141a,0x1796,0x17ed,0x192f,0x1a85,0x142a,0x1431,0x1439,0x1441,0x1422,0x1449,0x179e,0x17a5,
+0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x16ab,0x17ad,0x17b0,0x17ad,0x17ad,0x17b8,0x17bf,0x17c1,0x17c8,
+0x17d0,0x17d4,0x17d4,0x17d7,0x17d4,0x17d4,0x17dd,0x17d4,0x181d,0x18dd,0x1937,0xb7c,0xb82,0x1bca,0x1bd2,0x1ca9,
+0x187d,0xc2f,0xc33,0x18f2,0x186d,0x186d,0x186d,0xc07,0x1875,0xc27,0x18bd,0xc7d,0xc0f,0xc17,0xc17,0x197b,
+0x18ad,0x193f,0xc69,0xc6d,0x9f4,0x16b3,0x16b3,0x9fc,0x16bb,0x16bb,0x16bb,0x16bb,0x16bb,0x16bb,0xa04,0x6de,
+0x1511,0x1533,0xa0c,0x153b,0xa14,0x1543,0x154b,0x1553,0xa1c,0xa21,0x155b,0x1562,0xa26,0xa2e,0x18cd,0xbf7,
+0xa36,0x15bd,0x15c4,0x156a,0x15cc,0x15d3,0x1572,0x1576,0x158f,0x158f,0x1591,0x157e,0x1586,0x1586,0x1587,0x15db,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,
+0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x16c3,0x1264,0x1825,0x1825,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,
+0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x1599,0x15a0,0x19dc,0x126c,
+0x16cb,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,
+0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,0x16d1,
+0x16d1,0x16d1,0x16d1,0x16d1,0xa3e,0x16d9,0xa46,0x19fc,0x1987,0x1987,0x1987,0x1987,0x1987,0x1987,0x1987,0x1987,
+0x1983,0xce7,0x1997,0x198f,0x1999,0x1a04,0x1a04,0xd7b,0x1885,0x18fa,0x194f,0x1953,0x1947,0x1aa5,0xc9d,0xca0,
+0x18b5,0xc75,0x1902,0xca8,0x19a1,0x19a4,0xcef,0x1a0c,0x19b4,0x19ac,0xcf7,0xd83,0x1a14,0x1a18,0xd8b,0xfec,
+0x19bc,0xcff,0xd07,0x1a20,0x1a30,0x1a28,0xd93,0xeec,0xe3a,0xe42,0x1c19,0xfa4,0x1cc6,0x1cc6,0x1a38,0xd9b,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,
+0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,
+0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,
+0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,
+0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,
+0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,
+0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,
+0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,
+0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,
+0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,
+0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,
+0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,
+0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,
+0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,
+0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,
+0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,
+0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,
+0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,
+0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,
+0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0x1631,0x162b,0x162c,0x162d,0x162e,0x162f,0x1630,0xa4e,0xda3,0xda6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,
-0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,0x1607,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,
-0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x1504,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,0x15ac,
-0x15b1,0x15b9,0x17e9,0x127c,0x18c9,0x18c9,0x1280,0x1287,0xa5e,0xa66,0xa6e,0x1471,0x1478,0x1480,0xa76,0x1488,
-0x14b9,0x14b9,0x1461,0x1469,0x1490,0x14b0,0x14b1,0x14c1,0x1498,0x1459,0xa7e,0x14a0,0xa86,0x14a8,0xa8e,0xa92,
-0xc8d,0x14c9,0xa9a,0xaa2,0x14d1,0x14d7,0x14dc,0xaaa,0xaba,0x1521,0x1529,0x150c,0x1511,0xac2,0xaca,0xab2,
-0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,
-0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15f7,0x15ff,0x15ff,0x15ff,0x15ff,
+0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,
+0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,0x1603,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,
+0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x14fc,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,0x15a8,
+0x15ad,0x15b5,0x17e5,0x1274,0x18c5,0x18c5,0x1278,0x127f,0xa56,0xa5e,0xa66,0x1469,0x1470,0x1478,0xa6e,0x1480,
+0x14b1,0x14b1,0x1459,0x1461,0x1488,0x14a8,0x14a9,0x14b9,0x1490,0x1451,0xa76,0x1498,0xa7e,0x14a0,0xa86,0xa8a,
+0xc85,0x14c1,0xa92,0xa9a,0x14c9,0x14cf,0x14d4,0xaa2,0xab2,0x1519,0x1521,0x1504,0x1509,0xaba,0xac2,0xaaa,
+0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,
+0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15f3,0x15fb,0x15fb,0x15fb,0x15fb,
0x13d8,0x13d8,0x1418,0x1458,0x1498,0x14d8,0x1518,0x1558,0x1594,0x15d4,0x1600,0x1640,0x1680,0x16c0,0x1700,0x1740,
0x1780,0x17bc,0x17fc,0x183c,0x187c,0x18b0,0x18ec,0x192c,0x196c,0x19ac,0x19e8,0x1a28,0x1a68,0x1aa8,0x1ae8,0x1b28,
0xa80,0xac0,0xb00,0xb40,0xb80,0xa40,0xe48,0xa40,0xe6a,0xa40,0xa40,0xa40,0xa40,0xbc0,0x12d5,0x12d5,
@@ -1573,148 +1573,148 @@
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0xb92,0xb99,0xba1,0xba9,0x1831,0x1831,0x1831,0xbb1,0xbb9,0xbbc,0x1861,0x1859,0xbef,0xd17,0xd1b,0xd1f,
-0x4f6,0x4f6,0x4f6,0x4f6,0xd27,0x19c8,0xd2f,0xf44,0x16e5,0xad2,0xad8,0x1004,0xbc4,0x1899,0xc69,0x4f6,
-0x16fa,0x16ed,0x16f2,0x1839,0xbcc,0xbd4,0x1147,0x114d,0x1c05,0xf61,0x1bf5,0x6e6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0x1c25,0xfb4,0xfbc,0xfc4,0x4f6,0x4f6,0x4f6,0x4f6,
-0xbdc,0xbdf,0xdb6,0x1c6d,0xffc,0x6ee,0x4f6,0x1095,0xcb8,0xd37,0x4f6,0x4f6,0x1ba2,0xefc,0xf04,0x1cb5,
-0xc43,0xc4a,0xc52,0x1a44,0x1c4d,0x4f6,0x1c2d,0xfd4,0x1a4c,0xdbe,0xdc6,0xdce,0x1024,0x6f6,0x4f6,0x4f6,
-0x1a54,0x1a54,0x6fe,0x4f6,0x1ce2,0x10ad,0x1cda,0x10b5,0x1d9a,0x11c7,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0xdd6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dba,0x11ef,0x11f6,0x706,0x4f6,0x4f6,0x4f6,0x11fe,
-0x1ab9,0x1abb,0xe52,0xe59,0x1a5c,0x1a64,0xdde,0xf24,0x1b9a,0xee4,0xeec,0xfcc,0x1bba,0x1bbe,0xf1c,0x1044,
-0xf97,0xf9c,0x70e,0x4f6,0x109d,0x10a5,0x1c15,0xfa4,0xf79,0xf7f,0xf87,0xf8f,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1d2a,0x1d22,0x1137,0x113f,0x1c95,0x1c8d,0x106b,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1c7d,0x102c,0x1034,0x103c,
-0x1c45,0x1c3d,0xfe4,0x112f,0x1bc6,0xf34,0x716,0x4f6,0x107b,0x1083,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1d92,0x11a9,0x71e,0x4f6,0x4f6,0x1ca5,0x1c9d,0x1073,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1206,0x120a,0x1212,
-0x1d6a,0x1d62,0x1191,0x1d5a,0x1d52,0x726,0x1c75,0x101c,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x10ed,0x10f2,0x10fa,0x1101,0x1121,0x1127,0x4f6,0x4f6,0x1175,0x1179,0x1181,0x11b9,0x11bf,0x72e,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x11d7,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dd2,0x1248,
-0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,
-0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x190e,0x1913,0xcc0,0xcc7,0xcc7,0xcc7,
-0x191b,0x191b,0x191b,0xccf,0x1cd2,0x1cd2,0x1cd2,0x1cd2,0x1cd2,0x1cd2,0x736,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0xb8a,0xb91,0xb99,0xba1,0x182d,0x182d,0x182d,0xba9,0xbb1,0xbb4,0x185d,0x1855,0xbe7,0xd0f,0xd13,0xd17,
+0x4f6,0x4f6,0x4f6,0x4f6,0xd1f,0x19c4,0xd27,0xf3c,0x16e1,0xaca,0xad0,0xffc,0xbbc,0x1895,0xc61,0x4f6,
+0x16f6,0x16e9,0x16ee,0x1835,0xbc4,0xbcc,0x113f,0x1145,0x1c01,0xf59,0x1bf1,0x6e6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0x1c21,0xfac,0xfb4,0xfbc,0x4f6,0x4f6,0x4f6,0x4f6,
+0xbd4,0xbd7,0xdae,0x1c69,0xff4,0x6ee,0x4f6,0x108d,0xcb0,0xd2f,0x4f6,0x4f6,0x1b9e,0xef4,0xefc,0x1cb1,
+0xc3b,0xc42,0xc4a,0x1a40,0x1c49,0x4f6,0x1c29,0xfcc,0x1a48,0xdb6,0xdbe,0xdc6,0x101c,0x6f6,0x4f6,0x4f6,
+0x1a50,0x1a50,0x6fe,0x4f6,0x1cde,0x10a5,0x1cd6,0x10ad,0x1d96,0x11bf,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0xdce,0x4f6,0x4f6,0x4f6,0x4f6,0x1db6,0x11e7,0x11ee,0x706,0x4f6,0x4f6,0x4f6,0x11f6,
+0x1ab5,0x1ab7,0xe4a,0xe51,0x1a58,0x1a60,0xdd6,0xf1c,0x1b96,0xedc,0xee4,0xfc4,0x1bb6,0x1bba,0xf14,0x103c,
+0xf8f,0xf94,0x70e,0x4f6,0x1095,0x109d,0x1c11,0xf9c,0xf71,0xf77,0xf7f,0xf87,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1d26,0x1d1e,0x112f,0x1137,0x1c91,0x1c89,0x1063,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1c79,0x1024,0x102c,0x1034,
+0x1c41,0x1c39,0xfdc,0x1127,0x1bc2,0xf2c,0x716,0x4f6,0x1073,0x107b,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1d8e,0x11a1,0x71e,0x4f6,0x4f6,0x1ca1,0x1c99,0x106b,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x11fe,0x1202,0x120a,
+0x1d66,0x1d5e,0x1189,0x1d56,0x1d4e,0x726,0x1c71,0x1014,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x10e5,0x10ea,0x10f2,0x10f9,0x1119,0x111f,0x4f6,0x4f6,0x116d,0x1171,0x1179,0x11b1,0x11b7,0x72e,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x11cf,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dce,0x1240,
+0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,
+0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190a,0x190f,0xcb8,0xcbf,0xcbf,0xcbf,
+0x1917,0x1917,0x1917,0xcc7,0x1cce,0x1cce,0x1cce,0x1cce,0x1cce,0x1cce,0x736,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,0x1ac3,
-0x1ac3,0xe61,0xfec,0x73e,0x4f6,0x4f6,0x742,0xf3c,0x1c65,0x1c5d,0x100c,0x1014,0x74a,0x4f6,0x4f6,0x4f6,
+0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,0x1abf,
+0x1abf,0xe59,0xfe4,0x73e,0x4f6,0x4f6,0x742,0xf34,0x1c61,0x1c59,0x1004,0x100c,0x74a,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x1db2,0x1daa,0x11e7,0x4f6,0x4f6,0x4f6,0x1bb2,0x1bb2,0xf0c,0x1baa,0xf14,0x4f6,0x4f6,0x1119,
+0x4f6,0x4f6,0x1dae,0x1da6,0x11df,0x4f6,0x4f6,0x4f6,0x1bae,0x1bae,0xf04,0x1ba6,0xf0c,0x4f6,0x4f6,0x1111,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1bfd,0x1bfd,0x1bfd,0xf54,0xf59,0x752,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1bf9,0x1bf9,0x1bf9,0xf4c,0xf51,0x752,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1702,0x1702,0x1702,0x1702,0x1702,0x1702,0x1702,0xae0,0x1712,0xae8,0x1713,0x170a,0x171b,0x1721,0x1729,0xaf0,
-0x1851,0x1851,0x75a,0x4f6,0x4f6,0x4f6,0x4f6,0x11df,0x1841,0x1841,0xbe7,0xcd7,0x4f6,0x4f6,0x4f6,0x4f6,
-0x175a,0x1761,0xaf8,0x1764,0xb00,0xb08,0xb10,0x175e,0xb18,0xb20,0xb28,0x1763,0x176b,0x175a,0x1761,0x175d,
-0x1764,0x176c,0x175b,0x1762,0x175e,0xb2f,0x1731,0x1739,0x1740,0x1747,0x1734,0x173c,0x1743,0x174a,0xb37,0x1752,
-0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,0x1cfa,
-0x1cea,0x1ced,0x1cea,0x1cf4,0x10dd,0x762,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x16fe,0x16fe,0x16fe,0x16fe,0x16fe,0x16fe,0x16fe,0xad8,0x170e,0xae0,0x170f,0x1706,0x1717,0x171d,0x1725,0xae8,
+0x184d,0x184d,0x75a,0x4f6,0x4f6,0x4f6,0x4f6,0x11d7,0x183d,0x183d,0xbdf,0xccf,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1756,0x175d,0xaf0,0x1760,0xaf8,0xb00,0xb08,0x175a,0xb10,0xb18,0xb20,0x175f,0x1767,0x1756,0x175d,0x1759,
+0x1760,0x1768,0x1757,0x175e,0x175a,0xb27,0x172d,0x1735,0x173c,0x1743,0x1730,0x1738,0x173f,0x1746,0xb2f,0x174e,
+0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,0x1cf6,
+0x1ce6,0x1ce9,0x1ce6,0x1cf0,0x10d5,0x762,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1111,0x76a,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dca,0x121a,0x772,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dda,0x1250,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1109,0x76a,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dc6,0x1212,0x772,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1dd6,0x1248,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x1c35,0x1c35,0x1c35,0x1c35,0x1c35,0x1c35,0xfdc,0x4f6,0x1d1a,0x1d12,0x10e5,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x1c31,0x1c31,0x1c31,0x1c31,0x1c31,0x1c31,0xfd4,0x4f6,0x1d16,0x1d0e,0x10dd,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x776,0x1da2,0x11cf,0x4f6,0x4f6,0x1222,0x1223,0x77e,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0xea9,0xeb1,0xeb9,0xec1,0xec9,0xed1,0xed8,0xedc,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x776,0x1d9e,0x11c7,0x4f6,0x4f6,0x121a,0x121b,0x77e,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0xea1,0xea9,0xeb1,0xeb9,0xec1,0xec9,0xed0,0xed4,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x782,0x104c,0x1c85,0x1052,0x1c85,0x105a,0x105f,0x1063,0x1063,
-0x10bd,0x1d32,0x1d3a,0x10c5,0x1d0a,0x10cd,0x10d5,0x1d7a,0x1dc2,0x1dc2,0x1199,0x11a1,0x123a,0x1240,0x1240,0x1240,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x782,0x1044,0x1c81,0x104a,0x1c81,0x1052,0x1057,0x105b,0x105b,
+0x10b5,0x1d2e,0x1d36,0x10bd,0x1d06,0x10c5,0x10cd,0x1d76,0x1dbe,0x1dbe,0x1191,0x1199,0x1232,0x1238,0x1238,0x1238,
0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,
0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,
-0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78b,0xb3f,0x1774,0x1774,0x1774,0x793,0x793,0x793,0x793,
-0x1849,0x1849,0x1849,0x1849,0x1849,0x1849,0x1849,0x79b,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
+0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78a,0x78b,0xb37,0x1770,0x1770,0x1770,0x793,0x793,0x793,0x793,
+0x1845,0x1845,0x1845,0x1845,0x1845,0x1845,0x1845,0x79b,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,
-0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x19d0,0xd3f,0x19d8,0x19d8,0xd43,0xe69,0xe71,0xe79,
-0xdee,0x1a81,0x1a99,0xdf6,0x1a91,0xdfe,0xe02,0xe09,0xe11,0xe18,0xe20,0xe28,0xe2a,0xe2a,0xe2a,0xe2a,
-0x1afa,0x1b02,0x1afa,0x1b08,0x1b10,0x1adb,0x1b18,0x1b20,0x1afa,0x1b28,0x1b30,0x1b37,0x1b3f,0x1ae3,0x1afa,0x1b44,
-0x1aeb,0x1af2,0x1b4c,0x1b52,0x1be6,0x1bed,0x1bde,0x1b5a,0x1b62,0x1b6a,0x1b72,0x1c55,0x1b7a,0x1b82,0xe81,0xe89,
-0x1acb,0x1acb,0x1acb,0xe91,0x1c0d,0x1c0d,0xf69,0xf71,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,
-0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6e,0x1a6c,0x1a76,0x1a6c,0x1a6c,0x1a6c,
-0x1a6c,0x1a6c,0x1a6c,0x1a79,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0x1a6c,0xde6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x793,0x19cc,0xd37,0x19d4,0x19d4,0xd3b,0xe61,0xe69,0xe71,
+0xde6,0x1a7d,0x1a95,0xdee,0x1a8d,0xdf6,0xdfa,0xe01,0xe09,0xe10,0xe18,0xe20,0xe22,0xe22,0xe22,0xe22,
+0x1af6,0x1afe,0x1af6,0x1b04,0x1b0c,0x1ad7,0x1b14,0x1b1c,0x1af6,0x1b24,0x1b2c,0x1b33,0x1b3b,0x1adf,0x1af6,0x1b40,
+0x1ae7,0x1aee,0x1b48,0x1b4e,0x1be2,0x1be9,0x1bda,0x1b56,0x1b5e,0x1b66,0x1b6e,0x1c51,0x1b76,0x1b7e,0xe79,0xe81,
+0x1ac7,0x1ac7,0x1ac7,0xe89,0x1c09,0x1c09,0xf61,0xf69,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,
+0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0x1a6a,0x1a68,0x1a72,0x1a68,0x1a68,0x1a68,
+0x1a68,0x1a68,0x1a68,0x1a75,0x1a68,0x1a68,0x1a68,0x1a68,0x1a68,0xdde,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,
-0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cbd,0x1cc2,0x1cbd,0x1cbd,0x1cbd,0x108b,0x108d,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1155,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,
-0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,0x1d4a,
-0x1d4a,0x115d,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,
+0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cb9,0x1cbe,0x1cb9,0x1cb9,0x1cb9,0x1083,0x1085,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x114d,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,
+0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,0x1d46,
+0x1d46,0x1155,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1ad3,0x1d72,0x1d72,0x1d72,0x1d72,0x1d72,
-0x1d72,0x1d72,0x1165,0x116d,0x122b,0x1232,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,0x1d8a,
-0x1d8a,0x1189,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1acf,0x1d6e,0x1d6e,0x1d6e,0x1d6e,0x1d6e,
+0x1d6e,0x1d6e,0x115d,0x1165,0x1223,0x122a,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,0x1d86,
+0x1d86,0x1181,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,
-0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x128f,0x1258,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1260,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,
-0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1784,0x1297,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1264,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,
-0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1258,0x1264,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x129f,0x1b8a,0x1b8a,0x1b8a,0x1b8a,0x1b8a,0x1b8a,0x12a7,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x12af,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x160f,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1617,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,0x161f,
-0x161f,0x161f,0x161f,0x161f,0x161f,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,0x1627,
-0x1627,0x1627,0x1627,0x1627,0x1627,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,0x177c,
-0x177c,0x177c,0x177c,0x177c,0x177c,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,
-0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1aa1,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,
-0x1d02,0x1d02,0x1d02,0x1d02,0x1d02,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,
-0x1d42,0x1d42,0x1d42,0x1d42,0x1d42,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,
-0x1d82,0x1d82,0x1d82,0x1d82,0x1d82,0x4d5,0x4d5,0x4d5,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,
+0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x4f6,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1287,0x1250,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1258,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,
+0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x1780,0x128f,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x125c,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,
+0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x1250,0x125c,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1297,0x1b86,0x1b86,0x1b86,0x1b86,0x1b86,0x1b86,0x129f,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x12a7,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x160b,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1613,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,0x161b,
+0x161b,0x161b,0x161b,0x161b,0x161b,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,0x1623,
+0x1623,0x1623,0x1623,0x1623,0x1623,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,0x1778,
+0x1778,0x1778,0x1778,0x1778,0x1778,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,
+0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1a9d,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,
+0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1cfe,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,
+0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d3e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,
+0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x1d7e,0x4d5,0x4d5,0x4d5,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,
0x2bb,0x2be,0x2c7,0x2c1,0x2c1,0x2c4,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,
0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x2bb,0x7ef,0x7e9,0x7ce,0x7c5,0x7bc,0x7b9,0x7b0,0x7cb,
0x7b6,0x7c2,0x7c5,0x7e0,0x7d7,0x7c8,0x7ec,0x7bf,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,0x7ad,
@@ -2060,9 +2060,7 @@
0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,0xb37,
0x13e0,0x13e0,0x13e0,0x7e,0x7e,0x7e,0x7e,0x7e,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,
0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,0x85b,
-0x85b,0x85b,0x85b,0x85b,0x85b,0xd8f,0xd8f,0x81,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
-0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
-0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x81,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,
+0x85b,0x85b,0x85b,0x85b,0x85b,0xd8f,0xd8f,0x81,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,
0xb3d,0xb3d,0xb3d,0xb3d,0xb3d,0x84,0x84,0x84,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,
0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xb43,0xc93,0xb43,0xb43,0xb43,0xc93,0xb43,0x87,
0x87,0x87,0x87,0x87,0x87,0x87,0x87,0x87,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,0x11d3,
@@ -2781,7 +2779,8 @@
0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,0x85e,
0x85e,0x85e,0x85e,0x85e,0xd92,0xd92,0xec1,0x858,0x924,0x924,0x924,0x924,0x924,0x924,0x924,0x924,
0x924,0x924,0x924,0x924,0xd8c,0xd8c,0xd8c,0xd8c,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
-0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,
+0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x861,
+0x861,0x861,0x861,0x861,0x861,0x861,0x861,0x1aa3,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,
0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x92d,0x864,0x864,0x864,0x864,0x864,0x864,0xd95,
0xd95,0xd95,0xd95,0x930,0x930,0x930,0x930,0x930,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,
0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,0x864,
@@ -3325,17 +3324,17 @@
propsVectorsTrie_index+4952,
NULL,
4952,
- 25652,
+ 25636,
0xa40,
0x13d8,
0x0,
0x0,
0x110000,
- 0x7788,
+ 0x7778,
NULL, 0, FALSE, FALSE, 0, NULL
};
-static const uint32_t propsVectors[6819]={
+static const uint32_t propsVectors[6822]={
0x67,0,0,0x67,0,0x4e00000,0x67,0x80000,0x20,0x867,0,0,0xa67,0,0,0xb67,
0,0,0xc67,0,0,0xd67,0,0,0xe67,0,0,0x1067,0,0,0x1167,0,
0,0x1267,0,0,0x1367,0,0,0x1467,0,0,0x1567,0,0,0x1667,0,0,
@@ -3762,9 +3761,9 @@
0xc0012b23,0x4000000,0x1500000,0xc0012cbc,0x2802400,0x962460,0xc0012cbc,0x4000000,0x1600000,0xc0012cbc,0x6800000,0x1329800,0xc0012cbc,0x7c00100,0x230400,0xc00acf00,
0x4000000,0x34e00000,0xc00ae300,0x4000000,0x34e00000,0xc00b0500,0x4000000,0x34e00000,0xc00b0500,0x4000000,0xb6800000,0xc00b0b00,0x4000000,0x1200000,0xc00b0b00,0x7c00900,
0x1230400,0xc00b109a,0x7c00300,0xe30000,0xc00b2914,0x7c00100,0x2530000,0xc00b2916,0x7c00100,0x2530c00,0xc00b2a00,0x4000000,0x34e00000,0xc040af55,0x7c00100,0x230400,
-0xc0c12b80,0x4000000,0x200000};
+0xc0c12b80,0x4000000,0x200000,0xc14a44bf,0x4000000,0xe0000d};
-static const int32_t countPropsVectors=6819;
+static const int32_t countPropsVectors=6822;
static const int32_t propsVectorsColumns=3;
static const uint16_t scriptExtensions[256]={
0x800e,0x8019,8,0x8059,8,2,8,0x8038,8,6,8,0x8019,3,0x800c,2,0x22,
@@ -3784,6 +3783,6 @@
0x10,0x15,0x78,0x91,0x99,0x9d,0x9e,0xa0,0xa3,0xb2,0x80bb,0xa,0x9a,0xa,0x8023,0xa,
0xed,0x19,0x1c,0x804f,0x37,0x804e,0x2f,0x31,0x8053,0x2f,0x8031,2,0x8007,0x89,0x7e,0x8087};
-static const int32_t indexes[UPROPS_INDEX_COUNT]={0x2afc,0x2afc,0x2afc,0x2afc,0x66c6,3,0x8169,0x81e9,0x81e9,0x81e9,0xb2cbc,0x2a75a31,0,0,0,0};
+static const int32_t indexes[UPROPS_INDEX_COUNT]={0x2afc,0x2afc,0x2afc,0x2afc,0x66be,3,0x8164,0x81e4,0x81e4,0x81e4,0xb2cbc,0x2a75a31,0,0,0,0};
#endif // INCLUDED_FROM_UCHAR_C
diff --git a/source/common/unicode/enumset.h b/source/common/unicode/enumset.h
index 6d7fa72..bde8c45 100644
--- a/source/common/unicode/enumset.h
+++ b/source/common/unicode/enumset.h
@@ -43,7 +43,7 @@
inline int32_t contains(T toCheck) const { return get(toCheck); }
inline void set(T toSet, int32_t v) { fBools=(fBools&(~flag(toSet)))|(v?(flag(toSet)):0); }
inline int32_t get(T toCheck) const { return (fBools & flag(toCheck))?1:0; }
- inline UBool isValidEnum(T toCheck) const { return ((uint32_t)toCheck>=minValue&&(uint32_t)toCheck<limitValue); }
+ inline UBool isValidEnum(T toCheck) const { return (toCheck>=minValue&&toCheck<limitValue); }
inline UBool isValidValue(int32_t v) const { return (v==0||v==1); }
inline const EnumSet<T,minValue,limitValue>& operator=(const EnumSet<T,minValue,limitValue>& other) {
fBools = other.fBools;
diff --git a/source/common/unicode/uchar.h b/source/common/unicode/uchar.h
index f04ea70..d70c964 100644
--- a/source/common/unicode/uchar.h
+++ b/source/common/unicode/uchar.h
@@ -60,7 +60,7 @@
* @see u_getUnicodeVersion
* @stable ICU 2.0
*/
-#define U_UNICODE_VERSION "12.0"
+#define U_UNICODE_VERSION "12.1"
/**
* \file
diff --git a/source/common/unicode/uvernum.h b/source/common/unicode/uvernum.h
index 327fd25..7c114be 100644
--- a/source/common/unicode/uvernum.h
+++ b/source/common/unicode/uvernum.h
@@ -66,7 +66,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
-#define U_ICU_VERSION_MINOR_NUM 1
+#define U_ICU_VERSION_MINOR_NUM 2
/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
@@ -103,11 +103,14 @@
* \def U_ICU_ENTRY_POINT_RENAME
* @stable ICU 4.2
*/
-/*
+/**
* Disable the version suffix. Use the custom suffix if exists.
* \def U_DISABLE_VERSION_SUFFIX
* @internal
*/
+#ifndef U_DISABLE_VERSION_SUFFIX
+#define U_DISABLE_VERSION_SUFFIX 0
+#endif
#ifndef U_ICU_ENTRY_POINT_RENAME
#ifdef U_HAVE_LIB_SUFFIX
@@ -120,12 +123,14 @@
# define U_DEF2_ICU_ENTRY_POINT_RENAME(x,y) U_DEF_ICU_ENTRY_POINT_RENAME(x,y)
# define U_ICU_ENTRY_POINT_RENAME(x) U_DEF2_ICU_ENTRY_POINT_RENAME(x,U_LIB_SUFFIX_C_NAME)
# endif
-#elif !U_DISABLE_VERSION_SUFFIX
-# define U_DEF_ICU_ENTRY_POINT_RENAME(x,y) x ## y
-# define U_DEF2_ICU_ENTRY_POINT_RENAME(x,y) U_DEF_ICU_ENTRY_POINT_RENAME(x,y)
-# define U_ICU_ENTRY_POINT_RENAME(x) U_DEF2_ICU_ENTRY_POINT_RENAME(x,U_ICU_VERSION_SUFFIX)
#else
-# define U_ICU_ENTRY_POINT_RENAME(x) x
+# if !U_DISABLE_VERSION_SUFFIX
+# define U_DEF_ICU_ENTRY_POINT_RENAME(x,y) x ## y
+# define U_DEF2_ICU_ENTRY_POINT_RENAME(x,y) U_DEF_ICU_ENTRY_POINT_RENAME(x,y)
+# define U_ICU_ENTRY_POINT_RENAME(x) U_DEF2_ICU_ENTRY_POINT_RENAME(x,U_ICU_VERSION_SUFFIX)
+# else
+# define U_ICU_ENTRY_POINT_RENAME(x) x
+# endif
#endif
#endif
@@ -134,7 +139,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
-#define U_ICU_VERSION "64.1"
+#define U_ICU_VERSION "64.2"
/**
* The current ICU library major version number as a string, for library name suffixes.
@@ -153,7 +158,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
-#define U_ICU_DATA_VERSION "64.1"
+#define U_ICU_DATA_VERSION "64.2"
#endif /* U_HIDE_INTERNAL_API */
/*===========================================================================
diff --git a/source/config/mh-darwin b/source/config/mh-darwin
index e4ad462..dc708f6 100644
--- a/source/config/mh-darwin
+++ b/source/config/mh-darwin
@@ -31,9 +31,9 @@
## Compiler switches to embed a library name and version information
ifeq ($(ENABLE_RPATH),YES)
-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
else
-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
endif
## Compiler switch to embed a runtime search path
diff --git a/source/config/mh-solaris b/source/config/mh-solaris
index 3d7e6fe..5e2abcf 100644
--- a/source/config/mh-solaris
+++ b/source/config/mh-solaris
@@ -56,7 +56,7 @@
#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
## Compiler switch to embed a library name
-LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
+LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
## Shared object suffix
SO= so
diff --git a/source/config/mh-solaris-gcc b/source/config/mh-solaris-gcc
index 63db4f0..d55d9cc 100644
--- a/source/config/mh-solaris-gcc
+++ b/source/config/mh-solaris-gcc
@@ -25,7 +25,7 @@
LD_RPATH_PRE= -R
## Compiler switch to embed a library name
-LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
+LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
## Shared library options
LD_SOOPTIONS= -Wl,-Bsymbolic
diff --git a/source/config/pkgdataMakefile.in b/source/config/pkgdataMakefile.in
index 7bf24cc..f6fe198 100644
--- a/source/config/pkgdataMakefile.in
+++ b/source/config/pkgdataMakefile.in
@@ -16,6 +16,7 @@
OUTPUTFILE=pkgdata.inc
MIDDLE_SO_TARGET=
+PKGDATA_TRAILING_SPACE=" "
all : clean
@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
@@ -36,7 +37,6 @@
@echo RANLIB=$(RANLIB) >> $(OUTPUTFILE)
@echo INSTALL_CMD=$(INSTALL-L) >> $(OUTPUTFILE)
-
clean :
$(RMV) $(OUTPUTFILE)
diff --git a/source/configure b/source/configure
index 7c3d924..a36771d 100755
--- a/source/configure
+++ b/source/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ICU 64.1.
+# Generated by GNU Autoconf 2.69 for ICU 64.2.
#
# Report bugs to <http://icu-project.org/bugs>.
#
@@ -582,8 +582,8 @@
# Identity of this package.
PACKAGE_NAME='ICU'
PACKAGE_TARNAME='International Components for Unicode'
-PACKAGE_VERSION='64.1'
-PACKAGE_STRING='ICU 64.1'
+PACKAGE_VERSION='64.2'
+PACKAGE_STRING='ICU 64.2'
PACKAGE_BUGREPORT='http://icu-project.org/bugs'
PACKAGE_URL='http://icu-project.org'
@@ -1359,7 +1359,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ICU 64.1 to adapt to many kinds of systems.
+\`configure' configures ICU 64.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1425,7 +1425,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ICU 64.1:";;
+ short | recursive ) echo "Configuration of ICU 64.2:";;
esac
cat <<\_ACEOF
@@ -1562,7 +1562,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ICU configure 64.1
+ICU configure 64.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2254,7 +2254,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ICU $as_me 64.1, which was
+It was created by ICU $as_me 64.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8428,7 +8428,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ICU $as_me 64.1, which was
+This file was extended by ICU $as_me 64.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8482,7 +8482,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ICU config.status 64.1
+ICU config.status 64.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -9118,6 +9118,7 @@
if test -z "$PYTHON";
then
echo "" > data/rules.mk
+ echo "" > test/testdata/rules.mk
else
if test -f "$srcdir/data/locales/root.txt";
then
@@ -9222,7 +9223,7 @@
if test -z "$PYTHON";
then
- echo "** Note: Python not found. You will not be able to build data from source."
+ echo "** Note: Python not found. You will not be able to build data from source or run tests."
fi
$as_unset _CXX_CXXSUFFIX
diff --git a/source/configure.ac b/source/configure.ac
index c8aef74..8cd270b 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -1394,6 +1394,7 @@
if test -z "$PYTHON";
then
echo "" > data/rules.mk
+ echo "" > test/testdata/rules.mk
else
if test -f "$srcdir/data/locales/root.txt";
then
@@ -1504,7 +1505,7 @@
if test -z "$PYTHON";
then
- echo "** Note: Python not found. You will not be able to build data from source."
+ echo "** Note: Python not found. You will not be able to build data from source or run tests."
fi
$as_unset _CXX_CXXSUFFIX
diff --git a/source/data/brkitr/dictionaries/cjdict.txt b/source/data/brkitr/dictionaries/cjdict.txt
index ab389fc..d1e3cf0 100644
--- a/source/data/brkitr/dictionaries/cjdict.txt
+++ b/source/data/brkitr/dictionaries/cjdict.txt
@@ -55998,6 +55998,7 @@
令出惟行 164
令叔 142
令名 245
+令和 61
令嗣 136
令堂 127
令太郎 245
diff --git a/source/data/buildtool/locale_dependencies.py b/source/data/buildtool/locale_dependencies.py
index 061ef44..e70dd26 100644
--- a/source/data/buildtool/locale_dependencies.py
+++ b/source/data/buildtool/locale_dependencies.py
@@ -3,7 +3,7 @@
# License & terms of use: http://www.unicode.org/copyright.html#License
data = {
- "cldrVersion": "35",
+ "cldrVersion": "35.1",
"aliases": {
"ars": "ar_SA",
"az_AZ": "az_Latn_AZ",
diff --git a/source/data/coll/af.txt b/source/data/coll/af.txt
index ef0b3ea..91630d3 100644
--- a/source/data/coll/af.txt
+++ b/source/data/coll/af.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"&N<<<ʼn"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/am.txt b/source/data/coll/am.txt
index 42ca7e2..703502a 100644
--- a/source/data/coll/am.txt
+++ b/source/data/coll/am.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Ethi]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ar.txt b/source/data/coll/ar.txt
index 7dc82b7..2a2d970 100644
--- a/source/data/coll/ar.txt
+++ b/source/data/coll/ar.txt
@@ -9,7 +9,7 @@
"&ت<<ة<<<ﺔ<<<ﺓ"
"&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -397,7 +397,7 @@
"&ۓ=ﮰ=ﮱ"
"&ۀ=ﮤ=ﮥ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/as.txt b/source/data/coll/as.txt
index be69f7e..d8834f3 100644
--- a/source/data/coll/as.txt
+++ b/source/data/coll/as.txt
@@ -11,7 +11,7 @@
"&[before 1]ত<ৎ=ত্\u200D"
"&হ<ক্ষ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/az.txt b/source/data/coll/az.txt
index 957b429..6c04ed5 100644
--- a/source/data/coll/az.txt
+++ b/source/data/coll/az.txt
@@ -9,7 +9,7 @@
"[import az-u-co-standard]"
"[reorder others]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -26,7 +26,7 @@
"&H<x<<<X"
"&Z<w<<<W"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/be.txt b/source/data/coll/be.txt
index 0ebc9fc..c490f57 100644
--- a/source/data/coll/be.txt
+++ b/source/data/coll/be.txt
@@ -9,7 +9,7 @@
"&Е<ё<<<Ё"
"&у<ў<<<Ў"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/bg.txt b/source/data/coll/bg.txt
index 2a1f44c..df022cd 100644
--- a/source/data/coll/bg.txt
+++ b/source/data/coll/bg.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Cyrl]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/bn.txt b/source/data/coll/bn.txt
index 9e228fc..95d6974 100644
--- a/source/data/coll/bn.txt
+++ b/source/data/coll/bn.txt
@@ -9,7 +9,7 @@
"[reorder Beng Deva Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
"&ঔ<ং<ঃ<ঁ"
}
- Version{"35"}
+ Version{"35.1"}
}
traditional{
Sequence{
@@ -629,7 +629,7 @@
"&যৌ<<<য়ৌ"
"&য্<<<য়্"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/bs.txt b/source/data/coll/bs.txt
index 28c1c61..af3e34b 100644
--- a/source/data/coll/bs.txt
+++ b/source/data/coll/bs.txt
@@ -5,11 +5,11 @@
collations{
search{
Sequence{"[import hr-u-co-search]"}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{"[import hr]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/bs_Cyrl.txt b/source/data/coll/bs_Cyrl.txt
index 88cb075..70d9748 100644
--- a/source/data/coll/bs_Cyrl.txt
+++ b/source/data/coll/bs_Cyrl.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[import sr]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ca.txt b/source/data/coll/ca.txt
index 5458cef..ff7b961 100644
--- a/source/data/coll/ca.txt
+++ b/source/data/coll/ca.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"&L<ŀ=l·<<<Ŀ=L·"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ceb.txt b/source/data/coll/ceb.txt
index 9eab841..a281baa 100644
--- a/source/data/coll/ceb.txt
+++ b/source/data/coll/ceb.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"&N<ñ<<<Ñ<ng<<<Ng<<<NG"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/chr.txt b/source/data/coll/chr.txt
index a1daa5e..fd41e37 100644
--- a/source/data/coll/chr.txt
+++ b/source/data/coll/chr.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Cher]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/cs.txt b/source/data/coll/cs.txt
index ab24b09..52d8be7 100644
--- a/source/data/coll/cs.txt
+++ b/source/data/coll/cs.txt
@@ -11,7 +11,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/cy.txt b/source/data/coll/cy.txt
index 33d488a..20b9860 100644
--- a/source/data/coll/cy.txt
+++ b/source/data/coll/cy.txt
@@ -14,7 +14,7 @@
"&R<rh<<<Rh<<<RH"
"&T<th<<<Th<<<TH"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/da.txt b/source/data/coll/da.txt
index 2717908..539a544 100644
--- a/source/data/coll/da.txt
+++ b/source/data/coll/da.txt
@@ -9,7 +9,7 @@
"[import da-u-co-standard]"
"[caseFirst off]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -21,7 +21,7 @@
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<å<<<Å<<<aa<<<Aa<<<AA"
"&oe<<œ<<<Œ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/de.txt b/source/data/coll/de.txt
index 912c3a9..b424955 100644
--- a/source/data/coll/de.txt
+++ b/source/data/coll/de.txt
@@ -9,14 +9,14 @@
"&OE<<ö<<<Ö"
"&UE<<ü<<<Ü"
}
- Version{"35"}
+ Version{"35.1"}
}
search{
Sequence{
"[import und-u-co-search]"
"[import de-u-co-phonebk]"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/de_AT.txt b/source/data/coll/de_AT.txt
index bcbfc1c..23079ad 100644
--- a/source/data/coll/de_AT.txt
+++ b/source/data/coll/de_AT.txt
@@ -10,7 +10,7 @@
"&u<ü<<<Ü"
"&ss<ß<<<ẞ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/dsb.txt b/source/data/coll/dsb.txt
index c91160f..e9222c2 100644
--- a/source/data/coll/dsb.txt
+++ b/source/data/coll/dsb.txt
@@ -14,7 +14,7 @@
"&S<š<<<Š<ś<<<Ś"
"&Z<ž<<<Ž<ź<<<Ź"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ee.txt b/source/data/coll/ee.txt
index edd32e8..ab9ca0d 100644
--- a/source/data/coll/ee.txt
+++ b/source/data/coll/ee.txt
@@ -17,7 +17,7 @@
"&T<ts<<<Ts<<<TS"
"&V<ʋ<<<Ʋ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/el.txt b/source/data/coll/el.txt
index 51302be..fc02f1a 100644
--- a/source/data/coll/el.txt
+++ b/source/data/coll/el.txt
@@ -8,7 +8,7 @@
"[normalization on]"
"[reorder Grek]"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/en_US_POSIX.txt b/source/data/coll/en_US_POSIX.txt
index b743c95..7ef9ae3 100644
--- a/source/data/coll/en_US_POSIX.txt
+++ b/source/data/coll/en_US_POSIX.txt
@@ -8,7 +8,7 @@
"&A<*'\u0020'-'/'<*0-'@'<*ABCDEFGHIJKLMNOPQRSTUVWXYZ<*'['-'`'<*abcdefghijklmnopqrstuvwxyz"
"<*'{'-'\u007F'"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/eo.txt b/source/data/coll/eo.txt
index 37608c7..2cff60f 100644
--- a/source/data/coll/eo.txt
+++ b/source/data/coll/eo.txt
@@ -12,7 +12,7 @@
"&S<ŝ<<<Ŝ"
"&U<ŭ<<<Ŭ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/es.txt b/source/data/coll/es.txt
index d817c52..d6c2d5c 100644
--- a/source/data/coll/es.txt
+++ b/source/data/coll/es.txt
@@ -8,11 +8,11 @@
"[import und-u-co-search]"
"&N<ñ<<<Ñ"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{"&N<ñ<<<Ñ"}
- Version{"35"}
+ Version{"35.1"}
}
traditional{
Sequence{
@@ -20,7 +20,7 @@
"&C<ch<<<Ch<<<CH"
"&l<ll<<<Ll<<<LL"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/et.txt b/source/data/coll/et.txt
index e5a3da2..662e02f 100644
--- a/source/data/coll/et.txt
+++ b/source/data/coll/et.txt
@@ -8,7 +8,7 @@
"&[before 1]T<š<<<Š<z<<<Z<ž<<<Ž"
"&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/fa.txt b/source/data/coll/fa.txt
index 3e546d8..e8f3e47 100644
--- a/source/data/coll/fa.txt
+++ b/source/data/coll/fa.txt
@@ -16,7 +16,7 @@
"&ۏ<ه<<ە<<ہ<<ة<<ۃ<<ۀ<<ھ"
"&ی<<*ىےيېۑۍێ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/fa_AF.txt b/source/data/coll/fa_AF.txt
index d5bdd5b..e7c6b90 100644
--- a/source/data/coll/fa_AF.txt
+++ b/source/data/coll/fa_AF.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[import ps]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/fi.txt b/source/data/coll/fi.txt
index c5f8465..db2bf81 100644
--- a/source/data/coll/fi.txt
+++ b/source/data/coll/fi.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import fi-u-co-trad]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -20,7 +20,7 @@
"&Z\u0335<<ʒ<<<Ʒ"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø"
}
- Version{"35"}
+ Version{"35.1"}
}
traditional{
Sequence{
@@ -31,7 +31,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<õ<<<Õ<<œ<<<Œ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/fil.txt b/source/data/coll/fil.txt
index b52ac21..acbea2f 100644
--- a/source/data/coll/fil.txt
+++ b/source/data/coll/fil.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"&N<ñ<<<Ñ<ng<<<Ng<<<NG"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/fo.txt b/source/data/coll/fo.txt
index f103973..ee9674c 100644
--- a/source/data/coll/fo.txt
+++ b/source/data/coll/fo.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import fo-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -18,7 +18,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<<aa<<<Aa<<<AA"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/fr_CA.txt b/source/data/coll/fr_CA.txt
index e6d89af..e20533d 100644
--- a/source/data/coll/fr_CA.txt
+++ b/source/data/coll/fr_CA.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[backwards 2]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/gl.txt b/source/data/coll/gl.txt
index 1cfa72b..80c28ab 100644
--- a/source/data/coll/gl.txt
+++ b/source/data/coll/gl.txt
@@ -5,11 +5,11 @@
collations{
search{
Sequence{"[import es-u-co-search]"}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{"[import es]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/gu.txt b/source/data/coll/gu.txt
index bfb37e6..9be2d37 100644
--- a/source/data/coll/gu.txt
+++ b/source/data/coll/gu.txt
@@ -9,7 +9,7 @@
"[reorder Gujr Deva Beng Guru Orya Taml Telu Knda Mlym Sinh]"
"&ૐ<ં<<ઁ<ઃ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ha.txt b/source/data/coll/ha.txt
index d804d68..b9e4a8d 100644
--- a/source/data/coll/ha.txt
+++ b/source/data/coll/ha.txt
@@ -12,7 +12,7 @@
"&T<ts<<<Ts<<<TS"
"&Y<ƴ<<<ʼy<<<''y<<<Ƴ<<<ʼY<<<''Y"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/haw.txt b/source/data/coll/haw.txt
index 128c598..6dcf217 100644
--- a/source/data/coll/haw.txt
+++ b/source/data/coll/haw.txt
@@ -8,7 +8,7 @@
"&a<e<<<E<i<<<I<o<<<O<u<<<U"
"&w<ʻ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/he.txt b/source/data/coll/he.txt
index 40660f0..6ee79b7 100644
--- a/source/data/coll/he.txt
+++ b/source/data/coll/he.txt
@@ -11,7 +11,7 @@
"&״"
"<<'\u0022'"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -20,7 +20,7 @@
"&[before 2]''<<׳"
"&[before 2]'\u0022'<<״"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/hi.txt b/source/data/coll/hi.txt
index c6061dc..3ca5807 100644
--- a/source/data/coll/hi.txt
+++ b/source/data/coll/hi.txt
@@ -9,7 +9,7 @@
"[reorder Deva Beng Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
"&ॐ<ं<<ँ<ः"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/hr.txt b/source/data/coll/hr.txt
index 68884ec..5d8b00c 100644
--- a/source/data/coll/hr.txt
+++ b/source/data/coll/hr.txt
@@ -9,7 +9,7 @@
"[import hr-u-co-standard]"
"[reorder others]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -21,7 +21,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/hsb.txt b/source/data/coll/hsb.txt
index bc38fcc..2587d13 100644
--- a/source/data/coll/hsb.txt
+++ b/source/data/coll/hsb.txt
@@ -13,7 +13,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž<ź<<<Ź"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/hu.txt b/source/data/coll/hu.txt
index 3609015..d3ac8aa 100644
--- a/source/data/coll/hu.txt
+++ b/source/data/coll/hu.txt
@@ -44,7 +44,7 @@
"&Zs<<<Zzs/zs"
"&ZS<<<ZZS/ZS"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/hy.txt b/source/data/coll/hy.txt
index 17178f5..6a66c5a 100644
--- a/source/data/coll/hy.txt
+++ b/source/data/coll/hy.txt
@@ -8,7 +8,7 @@
"[reorder Armn]"
"&ք<և<<<Եւ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ig.txt b/source/data/coll/ig.txt
index e1e9a00..bdd10b4 100644
--- a/source/data/coll/ig.txt
+++ b/source/data/coll/ig.txt
@@ -15,7 +15,7 @@
"&S<sh<<<Sh<<<SH"
"&U<ụ<<<Ụ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/is.txt b/source/data/coll/is.txt
index 0d0ca2d..2f122d3 100644
--- a/source/data/coll/is.txt
+++ b/source/data/coll/is.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import is-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -21,7 +21,7 @@
"&[before 1]z<ý<<<Ý"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ö<<<Ö<<ø<<<Ø<å<<<Å"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ja.txt b/source/data/coll/ja.txt
index bac8748..e9fcf9b 100644
--- a/source/data/coll/ja.txt
+++ b/source/data/coll/ja.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ja{
- Version{"2.1.48.38"}
+ Version{"2.1.49.82"}
collations{
private-kana{
Sequence{
@@ -412,22 +412,22 @@
"&「=｢"
"&」=｣"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
- "&ヽ<*㍾㍽㍼㍻"
+ "&ヽ<*㍾㍽㍼㍻㋿"
"[import ja-u-co-private-kana]"
"&[last regular]<*亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠堯槇遙瑤凜熙"
}
- Version{"35"}
+ Version{"35.1"}
}
unihan{
Sequence{
"[import und-u-co-private-unihan]"
"[import ja-u-co-private-kana]"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ka.txt b/source/data/coll/ka.txt
index ce1aa89..8344691 100644
--- a/source/data/coll/ka.txt
+++ b/source/data/coll/ka.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Geor]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/kk.txt b/source/data/coll/kk.txt
index 7c703ef..b981ebf 100644
--- a/source/data/coll/kk.txt
+++ b/source/data/coll/kk.txt
@@ -10,7 +10,7 @@
"&Ұ<ү<<<Ү"
"&[before 1]ь<і<<<І"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/kl.txt b/source/data/coll/kl.txt
index 2b537b9..cf50288 100644
--- a/source/data/coll/kl.txt
+++ b/source/data/coll/kl.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import kl-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -19,7 +19,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/km.txt b/source/data/coll/km.txt
index 32362af..d39598e 100644
--- a/source/data/coll/km.txt
+++ b/source/data/coll/km.txt
@@ -66,7 +66,7 @@
"&ឱ<<<ឲ"
"&ៅ<ុំ<ំ<ាំ<ះ<ិះ<ុះ<េះ<ោះ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/kn.txt b/source/data/coll/kn.txt
index c9012fa..2efac9b 100644
--- a/source/data/coll/kn.txt
+++ b/source/data/coll/kn.txt
@@ -9,7 +9,7 @@
"[reorder Knda Deva Beng Guru Gujr Orya Taml Telu Mlym Sinh]"
"&ಔ<ಂ<ಃ<ೱ<ೲ"
}
- Version{"35"}
+ Version{"35.1"}
}
traditional{
Sequence{
@@ -651,7 +651,7 @@
"&ಫೋ<<<ಫ಼ೋ"
"&ಫೌ<<<ಫ಼ೌ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ko.txt b/source/data/coll/ko.txt
index 3eca91a..a5a7a66 100644
--- a/source/data/coll/ko.txt
+++ b/source/data/coll/ko.txt
@@ -283,7 +283,7 @@
"&ᅩᅣᅵ"
"=ᆧ"
}
- Version{"35"}
+ Version{"35.1"}
}
searchjl{
Sequence{
@@ -378,7 +378,7 @@
"&\u1109\u1109=\u110A<<<\u3146"
"&\u110C\u110C=\u110D<<<\u3149"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -862,14 +862,14 @@
"&희<<*僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲咥唏嘻悕戲暿欷燹爔豨餼"
"&힐<<*詰犵纈襭頡黠"
}
- Version{"35"}
+ Version{"35.1"}
}
unihan{
Sequence{
"[import und-u-co-private-unihan]"
"[reorder Hang Hani]"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/kok.txt b/source/data/coll/kok.txt
index 1454e44..4631d0e 100644
--- a/source/data/coll/kok.txt
+++ b/source/data/coll/kok.txt
@@ -11,7 +11,7 @@
"&ह<ळ"
"<क्ष"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ku.txt b/source/data/coll/ku.txt
index dd03190..53fac45 100644
--- a/source/data/coll/ku.txt
+++ b/source/data/coll/ku.txt
@@ -15,7 +15,7 @@
"&î<<í<<<Í"
"&û<<ú<<<Ú"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ky.txt b/source/data/coll/ky.txt
index c69d3b1..487bcf5 100644
--- a/source/data/coll/ky.txt
+++ b/source/data/coll/ky.txt
@@ -8,7 +8,7 @@
"[reorder Cyrl]"
"&е<ё<<<Ё"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/lkt.txt b/source/data/coll/lkt.txt
index 62fde44..e41584a 100644
--- a/source/data/coll/lkt.txt
+++ b/source/data/coll/lkt.txt
@@ -11,7 +11,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ln.txt b/source/data/coll/ln.txt
index ec4ed70..c412990 100644
--- a/source/data/coll/ln.txt
+++ b/source/data/coll/ln.txt
@@ -16,14 +16,14 @@
"&S<sh<<<sH<<<Sh<<<SH"
"&T<ts<<<tS<<<Ts<<<TS"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
"&E<ɛ<<<Ɛ"
"&O<<ɔ<<<Ɔ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/lo.txt b/source/data/coll/lo.txt
index b8064be..e06cce7 100644
--- a/source/data/coll/lo.txt
+++ b/source/data/coll/lo.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Laoo]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/lt.txt b/source/data/coll/lt.txt
index 492afdf..8a04be9 100644
--- a/source/data/coll/lt.txt
+++ b/source/data/coll/lt.txt
@@ -16,7 +16,7 @@
"&U<<ų<<<Ų<<ū<<<Ū"
"&Z<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/lv.txt b/source/data/coll/lv.txt
index 1f0b4d6..b001811 100644
--- a/source/data/coll/lv.txt
+++ b/source/data/coll/lv.txt
@@ -15,7 +15,7 @@
"&[before 1]T<š<<<Š"
"&[before 1]Ʒ<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/mk.txt b/source/data/coll/mk.txt
index 0fcef17..63f1d7a 100644
--- a/source/data/coll/mk.txt
+++ b/source/data/coll/mk.txt
@@ -10,7 +10,7 @@
"&ԃ<ѓ<<<Ѓ"
"&ћ<ќ<<<Ќ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ml.txt b/source/data/coll/ml.txt
index f1b85bb..bd81bc9 100644
--- a/source/data/coll/ml.txt
+++ b/source/data/coll/ml.txt
@@ -17,7 +17,7 @@
"&മ്<<ം"
"&ന്<<<ൻ്"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/mn.txt b/source/data/coll/mn.txt
index 7fe0f07..57ab9a4 100644
--- a/source/data/coll/mn.txt
+++ b/source/data/coll/mn.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Cyrl Mong]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/mr.txt b/source/data/coll/mr.txt
index 3c339f2..c0ad6f5 100644
--- a/source/data/coll/mr.txt
+++ b/source/data/coll/mr.txt
@@ -12,7 +12,7 @@
"<क्ष"
"<ज्ञ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/mt.txt b/source/data/coll/mt.txt
index 8a7d7f3..911e864 100644
--- a/source/data/coll/mt.txt
+++ b/source/data/coll/mt.txt
@@ -12,7 +12,7 @@
"&[before 1]i<ħ<<<Ħ"
"&[before 1]z<ż<<<Ż"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/my.txt b/source/data/coll/my.txt
index 33cb017..3006ccd 100644
--- a/source/data/coll/my.txt
+++ b/source/data/coll/my.txt
@@ -373,7 +373,7 @@
"&ထမင်း=ထ္မင်း"
"&လက်ဘက်=လ္ဘက်"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/nb.txt b/source/data/coll/nb.txt
index 3ec2df3..5e8cb99 100644
--- a/source/data/coll/nb.txt
+++ b/source/data/coll/nb.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import nb-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -18,7 +18,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<aa<<<Aa<<<AA"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ne.txt b/source/data/coll/ne.txt
index 40d589b..16b5905 100644
--- a/source/data/coll/ne.txt
+++ b/source/data/coll/ne.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Deva]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/nn.txt b/source/data/coll/nn.txt
index d061e0c..67cf8cd 100644
--- a/source/data/coll/nn.txt
+++ b/source/data/coll/nn.txt
@@ -5,11 +5,11 @@
collations{
search{
Sequence{"[import nb-u-co-search]"}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{"[import nb-u-co-standard]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/om.txt b/source/data/coll/om.txt
index ca4bfb0..0323f32 100644
--- a/source/data/coll/om.txt
+++ b/source/data/coll/om.txt
@@ -8,7 +8,7 @@
"&Z<ch<<<Ch<<<CH<dh<<<Dh<<<DH<kh<<<Kh<<<KH<ny<<<Ny<<<NY<ph<<<Ph<<<PH<"
"sh<<<Sh"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/or.txt b/source/data/coll/or.txt
index d9e5f24..c88653e 100644
--- a/source/data/coll/or.txt
+++ b/source/data/coll/or.txt
@@ -11,7 +11,7 @@
"&ହ<କ୍ଷ"
"&ଯ<<ୟ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/pa.txt b/source/data/coll/pa.txt
index d7d23f0..3dac101 100644
--- a/source/data/coll/pa.txt
+++ b/source/data/coll/pa.txt
@@ -10,7 +10,7 @@
"&ੱ<<ੰ<<ਂ<<ਁ<<਼"
"&ੜ<੍"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/pl.txt b/source/data/coll/pl.txt
index 3ff56f4..2c30f82 100644
--- a/source/data/coll/pl.txt
+++ b/source/data/coll/pl.txt
@@ -14,7 +14,7 @@
"&S<ś<<<Ś"
"&Z<ź<<<Ź<ż<<<Ż"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ps.txt b/source/data/coll/ps.txt
index 0f7f32d..a9cdf3f 100644
--- a/source/data/coll/ps.txt
+++ b/source/data/coll/ps.txt
@@ -24,7 +24,7 @@
"&ی<<*ىےيېۍ<<یٔ<<<ىٔ<<<ئ"
"&\u00A0<<\u200C<<\u200D"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ro.txt b/source/data/coll/ro.txt
index 2058e72..a220a5c 100644
--- a/source/data/coll/ro.txt
+++ b/source/data/coll/ro.txt
@@ -10,7 +10,7 @@
"&S<ş=ș<<<Ş=Ș"
"&T<ţ=ț<<<Ţ=Ț"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/root.txt b/source/data/coll/root.txt
index d7339df..19b138c 100644
--- a/source/data/coll/root.txt
+++ b/source/data/coll/root.txt
@@ -382,7 +382,7 @@
"& 👨 << 🧔 <<👱♂ <<👱🏻♂ <<👱🏼♂ <<👱🏽♂ <<👱🏾♂ <<👱🏿♂"
"& 👩 << 👱♀ << 👱🏻♀ << 👱🏼♀ << 👱🏽♀ << 👱🏾♀ << 👱🏿♀"
}
- Version{"35"}
+ Version{"35.1"}
}
eor{
Sequence{
@@ -922,7 +922,7 @@
"&ք"
"<և"
}
- Version{"35"}
+ Version{"35.1"}
}
private-unihan{
Sequence{
@@ -1165,7 +1165,7 @@
"&龟=\uFDD0龟"
"&龠=\uFDD0龠"
}
- Version{"35"}
+ Version{"35.1"}
}
search{
Sequence{
@@ -1284,11 +1284,11 @@
"&ᅳᅵ"
"=ᅴ"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{""}
- Version{"35"}
+ Version{"35.1"}
}
}
depends:process(dependency){"ucadata.icu"}
diff --git a/source/data/coll/ru.txt b/source/data/coll/ru.txt
index fb7cac7..86de9aa 100644
--- a/source/data/coll/ru.txt
+++ b/source/data/coll/ru.txt
@@ -5,7 +5,7 @@
collations{
standard{
Sequence{"[reorder Cyrl]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/se.txt b/source/data/coll/se.txt
index 819908f..2324a46 100644
--- a/source/data/coll/se.txt
+++ b/source/data/coll/se.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import se-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -53,7 +53,7 @@
"<<<Ô<<ǫ"
"<<<Ǫ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/si.txt b/source/data/coll/si.txt
index aeb49a4..36870b1 100644
--- a/source/data/coll/si.txt
+++ b/source/data/coll/si.txt
@@ -10,7 +10,7 @@
"&ඖ<ං<ඃ"
"&ජ්ඤ<<ඥ"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -19,7 +19,7 @@
"&ඖ<ං<ඃ"
"&ඥ<ඤ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/sk.txt b/source/data/coll/sk.txt
index 7ad12e1..9e102fc 100644
--- a/source/data/coll/sk.txt
+++ b/source/data/coll/sk.txt
@@ -21,7 +21,7 @@
"&Y<ý<<<Ý"
"&Z<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -33,7 +33,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/sl.txt b/source/data/coll/sl.txt
index 0bc060f..60a85b7 100644
--- a/source/data/coll/sl.txt
+++ b/source/data/coll/sl.txt
@@ -10,7 +10,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/smn.txt b/source/data/coll/smn.txt
index c21962f..de7cac9 100644
--- a/source/data/coll/smn.txt
+++ b/source/data/coll/smn.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import smn-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -19,7 +19,7 @@
"&S<š<<<Š"
"&Z<ž<<<Ž<æ<<<Æ<ø<<<Ø<å<<<Å<ã<<<Ã<ä<<<Ä<á<<<Á<ö<<<Ö"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/sq.txt b/source/data/coll/sq.txt
index 72d647b..683a370 100644
--- a/source/data/coll/sq.txt
+++ b/source/data/coll/sq.txt
@@ -17,7 +17,7 @@
"&[before 1]Y<xh<<<Xh<<<XH"
"&[before 1]Ʒ<zh<<<Zh<<<ZH"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/sr.txt b/source/data/coll/sr.txt
index 95f2986..f0e1821 100644
--- a/source/data/coll/sr.txt
+++ b/source/data/coll/sr.txt
@@ -8,7 +8,7 @@
"[reorder Cyrl]"
"[suppressContractions [Ии]]"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/sr_Latn.txt b/source/data/coll/sr_Latn.txt
index 8794f64..9e511f8 100644
--- a/source/data/coll/sr_Latn.txt
+++ b/source/data/coll/sr_Latn.txt
@@ -5,11 +5,11 @@
collations{
search{
Sequence{"[import hr-u-co-search]"}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{"[import hr]"}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/sv.txt b/source/data/coll/sv.txt
index 85b8f33..77c4c4a 100644
--- a/source/data/coll/sv.txt
+++ b/source/data/coll/sv.txt
@@ -12,14 +12,14 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô"
}
- Version{"35"}
+ Version{"35.1"}
}
search{
Sequence{
"[import und-u-co-search]"
"[import sv-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -30,7 +30,7 @@
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ta.txt b/source/data/coll/ta.txt
index 631cfb5..7b1a1a6 100644
--- a/source/data/coll/ta.txt
+++ b/source/data/coll/ta.txt
@@ -34,7 +34,7 @@
"&[before 1]ஹ<ஹ்"
"&[before 1]க்ஷ<க்ஷ்"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/te.txt b/source/data/coll/te.txt
index 117a566..1e282a2 100644
--- a/source/data/coll/te.txt
+++ b/source/data/coll/te.txt
@@ -9,7 +9,7 @@
"[reorder Telu Deva Beng Guru Gujr Orya Taml Knda Mlym Sinh]"
"&ఔ<ఁ<ం<ః"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/th.txt b/source/data/coll/th.txt
index 9fe1884..0c9930d 100644
--- a/source/data/coll/th.txt
+++ b/source/data/coll/th.txt
@@ -17,7 +17,7 @@
"&ๅํ<<<ํๅ"
"&ไ<ฺ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/tk.txt b/source/data/coll/tk.txt
index 3167ee2..8dae5b5 100644
--- a/source/data/coll/tk.txt
+++ b/source/data/coll/tk.txt
@@ -14,7 +14,7 @@
"&U<ü<<<Ü"
"&Y<ý<<<Ý"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/to.txt b/source/data/coll/to.txt
index a984596..fd5a67d 100644
--- a/source/data/coll/to.txt
+++ b/source/data/coll/to.txt
@@ -13,7 +13,7 @@
"&o<<ó<<<Ó<<ō<<<Ō"
"&u<<ú<<<Ú<<ū<<<Ū"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/tr.txt b/source/data/coll/tr.txt
index 0c2da27..4cfce32 100644
--- a/source/data/coll/tr.txt
+++ b/source/data/coll/tr.txt
@@ -8,7 +8,7 @@
"[import und-u-co-search]"
"[import tr-u-co-standard]"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -20,7 +20,7 @@
"&S<ş<<<Ş"
"&U<ü<<<Ü"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ug.txt b/source/data/coll/ug.txt
index d41bf63..c2e9bc2 100644
--- a/source/data/coll/ug.txt
+++ b/source/data/coll/ug.txt
@@ -10,7 +10,7 @@
"&ك<گ<ڭ<ل"
"&ھ<و<ۇ<ۆ<ۈ<ۋ<ې<ى<ي"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/uk.txt b/source/data/coll/uk.txt
index c6daa83..7105033 100644
--- a/source/data/coll/uk.txt
+++ b/source/data/coll/uk.txt
@@ -9,7 +9,7 @@
"&Г<ґ<<<Ґ"
"&ꙇ<ї<<<\uA676<<<Ї"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/ur.txt b/source/data/coll/ur.txt
index 06bf86e..47b4462 100644
--- a/source/data/coll/ur.txt
+++ b/source/data/coll/ur.txt
@@ -12,7 +12,7 @@
"<<\u0651<<\u0658<<\u0653"
"&[last tertiary ignorable]<<<\u0610<<<\u0611<<<\u0613<<<\u0612<<<\u0614"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/uz.txt b/source/data/coll/uz.txt
index c69b170..d8f6dd1 100644
--- a/source/data/coll/uz.txt
+++ b/source/data/coll/uz.txt
@@ -10,7 +10,7 @@
"<sh<<<Sh<<<SH"
"<ch<<<Ch<<<CH"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/vi.txt b/source/data/coll/vi.txt
index 18c375d..0170caa 100644
--- a/source/data/coll/vi.txt
+++ b/source/data/coll/vi.txt
@@ -13,7 +13,7 @@
"&o<ô<<<Ô<ơ<<<Ơ"
"&u<ư<<<Ư"
}
- Version{"35"}
+ Version{"35.1"}
}
traditional{
Sequence{
@@ -32,7 +32,7 @@
"&T<th<<<Th<<<TH<tr<<<Tr<<<TR"
"&u<ư<<<Ư"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/wo.txt b/source/data/coll/wo.txt
index 6ae2825..e6430c2 100644
--- a/source/data/coll/wo.txt
+++ b/source/data/coll/wo.txt
@@ -11,7 +11,7 @@
"&N<ñ<<<Ñ<ŋ<<<Ŋ"
"&O<ó<<<Ó"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/yi.txt b/source/data/coll/yi.txt
index 522dce7..46cfd72 100644
--- a/source/data/coll/yi.txt
+++ b/source/data/coll/yi.txt
@@ -11,7 +11,7 @@
"&״"
"<<'\u0022'"
}
- Version{"35"}
+ Version{"35.1"}
}
standard{
Sequence{
@@ -28,7 +28,7 @@
"&ש<שׂ"
"&[before 1]ת<תּ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/yo.txt b/source/data/coll/yo.txt
index 55ca664..c2f75de 100644
--- a/source/data/coll/yo.txt
+++ b/source/data/coll/yo.txt
@@ -11,7 +11,7 @@
"&O<ọ<<<Ọ"
"&S<ṣ<<<Ṣ"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/coll/zh.txt b/source/data/coll/zh.txt
index 0135988..b7e70d7 100644
--- a/source/data/coll/zh.txt
+++ b/source/data/coll/zh.txt
@@ -9,7 +9,7 @@
"[reorder Latn Hani Bopo]"
"&[last regular]<*兙兛兞兝兡兣嗧瓩糎一乙丁七乃九了二人儿入八几刀刁力匕十卜又三下丈上丫丸凡久么也乞于亡兀刃勺千叉口土士夕大女子孑孓寸小尢尸山川工己已巳巾干廾弋弓才丑丐不中丰丹之尹予云井互五亢仁什仃仆仇仍今介仄元允內六兮公冗凶分切刈勻勾勿化匹午升卅卞厄友及反壬天夫太夭孔少尤尺屯巴幻廿弔引心戈戶手扎支文斗斤方日曰月木欠止歹毋比毛氏水火爪父爻片牙牛犬王丙世丕且丘主乍乏乎以付仔仕他仗代令仙仞充兄冉冊冬凹出凸刊加功包匆北匝仟半卉卡占卯卮去可古右召叮叩叨叼司叵叫另只史叱台句叭叻四囚外央失奴奶孕它尼巨巧左市布平幼弁弘弗必戊打扔扒扑斥旦朮本未末札正母民氐永汁汀氾犯玄玉瓜瓦甘生用甩田由甲申疋白皮皿目矛矢石示禾穴立丞丟乒乓乩亙交亦亥仿伉伙伊伕伍伐休伏仲件任仰仳份企伋光兇兆先全共再冰列刑划刎刖劣匈匡匠印危吉吏同吊吐吁吋各向名合吃后吆吒因回囝圳地在圭圬圯圩夙多夷夸妄奸妃好她如妁字存宇守宅安寺尖屹州帆并年式弛忙忖戎戌戍成扣扛托收早旨旬旭曲曳有朽朴朱朵次此死氖汝汗汙江池汐汕污汛汍汎灰牟牝百竹米糸缶羊羽老考而耒耳聿肉肋肌臣自至臼舌舛舟艮色艾虫血行衣西阡串亨位住佇佗佞伴佛何估佐佑伽伺伸佃佔似但佣作你伯低伶余佝佈佚兌克免兵冶冷別判利刪刨劫助努劬匣即卵吝吭吞吾否呎吧呆呃吳呈呂君吩告吹吻吸吮吵吶吠吼呀吱含吟听囪困囤囫坊坑址坍均坎圾坐坏圻壯夾妝妒妨妞妣妙妖妍妤妓妊妥孝孜孚孛完宋宏尬局屁尿尾岐岑岔岌巫希序庇床廷弄弟彤形彷役忘忌志忍忱快忸忪戒我抄抗抖技扶抉扭把扼找批扳抒扯折扮投抓抑抆改攻攸旱更束李杏材村杜杖杞杉杆杠杓杗步每求汞沙沁沈沉沅沛汪決沐汰沌汨沖沒汽沃汲汾汴沆汶沍沔沘沂灶灼災灸牢牡牠狄狂玖甬甫男甸皂盯矣私秀禿究系罕肖肓肝肘肛肚育良芒芋芍見角言谷豆豕貝赤走足身車辛辰迂迆迅迄巡邑邢邪邦那酉釆里防阮阱阪阬並乖乳事些亞享京佯依侍佳使佬供例來侃佰併侈佩佻侖佾侏侑佺兔兒兕兩具其典冽函刻券刷刺到刮制剁劾劻卒協卓卑卦卷卸卹取叔受味呵咖呸咕咀呻呷咄咒咆呼咐呱呶和咚呢周咋命咎固垃坷坪坩坡坦坤坼夜奉奇奈奄奔妾妻委妹妮姑姆姐姍始姓姊妯妳姒姅孟孤季宗定官宜宙宛尚屈居屆岷岡岸岩岫岱岳帘帚帖帕帛帑幸庚店府底庖延弦弧弩往征彿彼忝忠忽念忿怏怔怯怵怖怪怕怡性怩怫怛或戕房戾所承拉拌拄抿拂抹拒招披拓拔拋拈抨抽押拐拙拇拍抵拚抱拘拖拗拆抬拎放斧於旺昔易昌昆昂明昀昏昕昊昇服朋杭枋枕東果杳杷枇枝林杯杰板枉松析杵枚枓杼杪杲欣武歧歿氓氛泣注泳沱泌泥河沽沾沼波沫法泓沸泄油況沮泗泅泱沿治泡泛泊沬泯泜泖泠炕炎炒炊炙爬爭爸版牧物狀狎狙狗狐玩玨玟玫玥甽疝疙疚的盂盲直知矽社祀祁秉秈空穹竺糾罔羌羋者肺肥肢肱股肫肩肴肪肯臥臾舍芳芝芙芭芽芟芹花芬芥芯芸芣芰芾芷虎虱初表軋迎返近邵邸邱邶采金長門阜陀阿阻附陂隹雨青非亟亭亮信侵侯便俠俑俏保促侶俘俟俊俗侮俐俄係俚俎俞侷兗冒冑冠剎剃削前剌剋則勇勉勃勁匍南卻厚叛咬哀咨哎哉咸咦咳哇哂咽咪品哄哈咯咫咱咻咩咧咿囿垂型垠垣垢城垮垓奕契奏奎奐姜姘姿姣姨娃姥姪姚姦威姻孩宣宦室客宥封屎屏屍屋峙峒巷帝帥帟幽庠度建弈弭彥很待徊律徇後徉怒思怠急怎怨恍恰恨恢恆恃恬恫恪恤扁拜挖按拼拭持拮拽指拱拷拯括拾拴挑挂政故斫施既春昭映昧是星昨昱昤曷柿染柱柔某柬架枯柵柩柯柄柑枴柚查枸柏柞柳枰柙柢柝柒歪殃殆段毒毗氟泉洋洲洪流津洌洱洞洗活洽派洶洛泵洹洧洸洩洮洵洎洫炫為炳炬炯炭炸炮炤爰牲牯牴狩狠狡玷珊玻玲珍珀玳甚甭畏界畎畋疫疤疥疢疣癸皆皇皈盈盆盃盅省盹相眉看盾盼眇矜砂研砌砍祆祉祈祇禹禺科秒秋穿突竿竽籽紂紅紀紉紇約紆缸美羿耄耐耍耑耶胖胥胚胃胄背胡胛胎胞胤胝致舢苧范茅苣苛苦茄若茂茉苒苗英茁苜苔苑苞苓苟苯茆虐虹虻虺衍衫要觔計訂訃貞負赴赳趴軍軌述迦迢迪迥迭迫迤迨郊郎郁郃酋酊重閂限陋陌降面革韋韭音頁風飛食首香乘亳倌倍倣俯倦倥俸倩倖倆值借倚倒們俺倀倔倨俱倡個候倘俳修倭倪俾倫倉兼冤冥冢凍凌准凋剖剜剔剛剝匪卿原厝叟哨唐唁唷哼哥哲唆哺唔哩哭員唉哮哪哦唧唇哽唏圃圄埂埔埋埃堉夏套奘奚娑娘娜娟娛娓姬娠娣娩娥娌娉孫屘宰害家宴宮宵容宸射屑展屐峭峽峻峪峨峰島崁峴差席師庫庭座弱徒徑徐恙恣恥恐恕恭恩息悄悟悚悍悔悌悅悖扇拳挈拿捎挾振捕捂捆捏捉挺捐挽挪挫挨捍捌效敉料旁旅時晉晏晃晒晌晅晁書朔朕朗校核案框桓根桂桔栩梳栗桌桑栽柴桐桀格桃株桅栓栘桁殊殉殷氣氧氨氦氤泰浪涕消涇浦浸海浙涓浬涉浮浚浴浩涌涊浹涅浥涔烊烘烤烙烈烏爹特狼狹狽狸狷玆班琉珮珠珪珞畔畝畜畚留疾病症疲疳疽疼疹痂疸皋皰益盍盎眩真眠眨矩砰砧砸砝破砷砥砭砠砟砲祕祐祠祟祖神祝祗祚秤秣秧租秦秩秘窄窈站笆笑粉紡紗紋紊素索純紐紕級紜納紙紛缺罟羔翅翁耆耘耕耙耗耽耿胱脂胰脅胭胴脆胸胳脈能脊胼胯臭臬舀舐航舫舨般芻茫荒荔荊茸荐草茵茴荏茲茹茶茗荀茱茨荃虔蚊蚪蚓蚤蚩蚌蚣蚜衰衷袁袂衽衹記訐討訌訕訊託訓訖訏訑豈豺豹財貢起躬軒軔軏辱送逆迷退迺迴逃追逅迸邕郡郝郢酒配酌釘針釗釜釙閃院陣陡陛陝除陘陞隻飢馬骨高鬥鬲鬼乾偺偽停假偃偌做偉健偶偎偕偵側偷偏倏偯偭兜冕凰剪副勒務勘動匐匏匙匿區匾參曼商啪啦啄啞啡啃啊唱啖問啕唯啤唸售啜唬啣唳啁啗圈國圉域堅堊堆埠埤基堂堵執培夠奢娶婁婉婦婪婀娼婢婚婆婊孰寇寅寄寂宿密尉專將屠屜屝崇崆崎崛崖崢崑崩崔崙崤崧崗巢常帶帳帷康庸庶庵庾張強彗彬彩彫得徙從徘御徠徜恿患悉悠您惋悴惦悽情悻悵惜悼惘惕惆惟悸惚惇戚戛扈掠控捲掖探接捷捧掘措捱掩掉掃掛捫推掄授掙採掬排掏掀捻捩捨捺敝敖救教敗啟敏敘敕敔斜斛斬族旋旌旎晝晚晤晨晦晞曹勗望梁梯梢梓梵桿桶梱梧梗械梃棄梭梆梅梔條梨梟梡梂欲殺毫毬氫涎涼淳淙液淡淌淤添淺清淇淋涯淑涮淞淹涸混淵淅淒渚涵淚淫淘淪深淮淨淆淄涪淬涿淦烹焉焊烽烯爽牽犁猜猛猖猓猙率琅琊球理現琍瓠瓶瓷甜產略畦畢異疏痔痕疵痊痍皎盔盒盛眷眾眼眶眸眺硫硃硎祥票祭移窒窕笠笨笛第符笙笞笮粒粗粕絆絃統紮紹紼絀細紳組累終紲紱缽羞羚翌翎習耜聊聆脯脖脣脫脩脰脤舂舵舷舶船莎莞莘荸莢莖莽莫莒莊莓莉莠荷荻荼莆莧處彪蛇蛀蚶蛄蚵蛆蛋蚱蚯蛉術袞袈被袒袖袍袋覓規訪訝訣訥許設訟訛訢豉豚販責貫貨貪貧赧赦趾趺軛軟這逍通逗連速逝逐逕逞造透逢逖逛途部郭都酗野釵釦釣釧釭釩閉陪陵陳陸陰陴陶陷陬雀雪雩章竟頂頃魚鳥鹵鹿麥麻傢傍傅備傑傀傖傘傚最凱割剴創剩勞勝勛博厥啻喀喧啼喊喝喘喂喜喪喔喇喋喃喳單喟唾喲喚喻喬喱啾喉喫喙圍堯堪場堤堰報堡堝堠壹壺奠婷媚婿媒媛媧孳孱寒富寓寐尊尋就嵌嵐崴嵇巽幅帽幀幃幾廊廁廂廄弼彭復循徨惑惡悲悶惠愜愣惺愕惰惻惴慨惱愎惶愉愀愒戟扉掣掌描揀揩揉揆揍插揣提握揖揭揮捶援揪換摒揚揹敞敦敢散斑斐斯普晰晴晶景暑智晾晷曾替期朝棺棕棠棘棗椅棟棵森棧棹棒棲棣棋棍植椒椎棉棚楮棻款欺欽殘殖殼毯氮氯氬港游湔渡渲湧湊渠渥渣減湛湘渤湖湮渭渦湯渴湍渺測湃渝渾滋溉渙湎湣湄湲湩湟焙焚焦焰無然煮焜牌犄犀猶猥猴猩琺琪琳琢琥琵琶琴琯琛琦琨甥甦畫番痢痛痣痙痘痞痠登發皖皓皴盜睏短硝硬硯稍稈程稅稀窘窗窖童竣等策筆筐筒答筍筋筏筑粟粥絞結絨絕紫絮絲絡給絢絰絳善翔翕耋聒肅腕腔腋腑腎脹腆脾腌腓腴舒舜菩萃菸萍菠菅萋菁華菱菴著萊菰萌菌菽菲菊萸萎萄菜萇菔菟虛蛟蛙蛭蛔蛛蛤蛐蛞街裁裂袱覃視註詠評詞証詁詔詛詐詆訴診訶詖象貂貯貼貳貽賁費賀貴買貶貿貸越超趁跎距跋跚跑跌跛跆軻軸軼辜逮逵週逸進逶鄂郵鄉郾酣酥量鈔鈕鈣鈉鈞鈍鈐鈇鈑閔閏開閑間閒閎隊階隋陽隅隆隍陲隄雁雅雄集雇雯雲韌項順須飧飪飯飩飲飭馮馭黃黍黑亂傭債傲傳僅傾催傷傻傯僇剿剷剽募勦勤勢勣匯嗟嗨嗓嗦嗎嗜嗇嗑嗣嗤嗯嗚嗡嗅嗆嗥嗉園圓塞塑塘塗塚塔填塌塭塊塢塒塋奧嫁嫉嫌媾媽媼媳嫂媲嵩嵯幌幹廉廈弒彙徬微愚意慈感想愛惹愁愈慎慌慄慍愾愴愧愍愆愷戡戢搓搾搞搪搭搽搬搏搜搔損搶搖搗搆敬斟新暗暉暇暈暖暄暘暍會榔業楚楷楠楔極椰概楊楨楫楞楓楹榆楝楣楛歇歲毀殿毓毽溢溯滓溶滂源溝滇滅溥溘溼溺溫滑準溜滄滔溪溧溴煎煙煩煤煉照煜煬煦煌煥煞煆煨煖爺牒猷獅猿猾瑯瑚瑕瑟瑞瑁琿瑙瑛瑜當畸瘀痰瘁痲痱痺痿痴痳盞盟睛睫睦睞督睹睪睬睜睥睨睢矮碎碰碗碘碌碉硼碑碓硿祺祿禁萬禽稜稚稠稔稟稞窟窠筷節筠筮筧粱粳粵經絹綑綁綏絛置罩罪署義羨群聖聘肆肄腱腰腸腥腮腳腫腹腺腦舅艇蒂葷落萱葵葦葫葉葬葛萼萵葡董葩葭葆虞虜號蛹蜓蜈蜇蜀蛾蛻蜂蜃蜆蜊衙裟裔裙補裘裝裡裊裕裒覜解詫該詳試詩詰誇詼詣誠話誅詭詢詮詬詹詻訾詨豢貊貉賊資賈賄貲賃賂賅跡跟跨路跳跺跪跤跦躲較載軾輊辟農運遊道遂達逼違遐遇遏過遍遑逾遁鄒鄗酬酪酩釉鈷鉗鈸鈽鉀鈾鉛鉋鉤鉑鈴鉉鉍鉅鈹鈿鉚閘隘隔隕雍雋雉雊雷電雹零靖靴靶預頑頓頊頒頌飼飴飽飾馳馱馴髡鳩麂鼎鼓鼠僧僮僥僖僭僚僕像僑僱僎僩兢凳劃劂匱厭嗾嘀嘛嘗嗽嘔嘆嘉嘍嘎嗷嘖嘟嘈嘐嗶團圖塵塾境墓墊塹墅塽壽夥夢夤奪奩嫡嫦嫩嫗嫖嫘嫣孵寞寧寡寥實寨寢寤察對屢嶄嶇幛幣幕幗幔廓廖弊彆彰徹慇愿態慷慢慣慟慚慘慵截撇摘摔撤摸摟摺摑摧搴摭摻敲斡旗旖暢暨暝榜榨榕槁榮槓構榛榷榻榫榴槐槍榭槌榦槃榣歉歌氳漳演滾漓滴漩漾漠漬漏漂漢滿滯漆漱漸漲漣漕漫漯澈漪滬漁滲滌滷熔熙煽熊熄熒爾犒犖獄獐瑤瑣瑪瑰瑭甄疑瘧瘍瘋瘉瘓盡監瞄睽睿睡磁碟碧碳碩碣禎福禍種稱窪窩竭端管箕箋筵算箝箔箏箸箇箄粹粽精綻綰綜綽綾綠緊綴網綱綺綢綿綵綸維緒緇綬罰翠翡翟聞聚肇腐膀膏膈膊腿膂臧臺與舔舞艋蓉蒿蓆蓄蒙蒞蒲蒜蓋蒸蓀蓓蒐蒼蓑蓊蜿蜜蜻蜢蜥蜴蜘蝕蜷蜩裳褂裴裹裸製裨褚裯誦誌語誣認誡誓誤說誥誨誘誑誚誧豪貍貌賓賑賒赫趙趕跼輔輒輕輓辣遠遘遜遣遙遞遢遝遛鄙鄘鄞酵酸酷酴鉸銀銅銘銖鉻銓銜銨鉼銑閡閨閩閣閥閤隙障際雌雒需靼鞅韶頗領颯颱餃餅餌餉駁骯骰髦魁魂鳴鳶鳳麼鼻齊億儀僻僵價儂儈儉儅凜劇劈劉劍劊勰厲嘮嘻嘹嘲嘿嘴嘩噓噎噗噴嘶嘯嘰墀墟增墳墜墮墩墦奭嬉嫻嬋嫵嬌嬈寮寬審寫層履嶝嶔幢幟幡廢廚廟廝廣廠彈影德徵慶慧慮慝慕憂慼慰慫慾憧憐憫憎憬憚憤憔憮戮摩摯摹撞撲撈撐撰撥撓撕撩撒撮播撫撚撬撙撢撳敵敷數暮暫暴暱樣樟槨樁樞標槽模樓樊槳樂樅槭樑歐歎殤毅毆漿潼澄潑潦潔澆潭潛潸潮澎潺潰潤澗潘滕潯潠潟熟熬熱熨牖犛獎獗瑩璋璃瑾璀畿瘠瘩瘟瘤瘦瘡瘢皚皺盤瞎瞇瞌瞑瞋磋磅確磊碾磕碼磐稿稼穀稽稷稻窯窮箭箱範箴篆篇篁箠篌糊締練緯緻緘緬緝編緣線緞緩綞緙緲緹罵罷羯翩耦膛膜膝膠膚膘蔗蔽蔚蓮蔬蔭蔓蔑蔣蔡蔔蓬蔥蓿蔆螂蝴蝶蝠蝦蝸蝨蝙蝗蝌蝓衛衝褐複褒褓褕褊誼諒談諄誕請諸課諉諂調誰論諍誶誹諛豌豎豬賠賞賦賤賬賭賢賣賜質賡赭趟趣踫踐踝踢踏踩踟踡踞躺輝輛輟輩輦輪輜輞輥適遮遨遭遷鄰鄭鄧鄱醇醉醋醃鋅銻銷鋪銬鋤鋁銳銼鋒鋇鋰銲閭閱霄霆震霉靠鞍鞋鞏頡頫頜颳養餓餒餘駝駐駟駛駑駕駒駙骷髮髯鬧魅魄魷魯鴆鴉鴃麩麾黎墨齒儒儘儔儐儕冀冪凝劑劓勳噙噫噹噩噤噸噪器噥噱噯噬噢噶壁墾壇壅奮嬝嬴學寰導彊憲憑憩憊懍憶憾懊懈戰擅擁擋撻撼據擄擇擂操撿擒擔撾整曆曉暹曄曇暸樽樸樺橙橫橘樹橄橢橡橋橇樵機橈歙歷氅濂澱澡濃澤濁澧澳激澹澶澦澠澴熾燉燐燒燈燕熹燎燙燜燃燄獨璜璣璘璟璞瓢甌甍瘴瘸瘺盧盥瞠瞞瞟瞥磨磚磬磧禦積穎穆穌穋窺篙簑築篤篛篡篩篦糕糖縊縑縈縛縣縞縝縉縐罹羲翰翱翮耨膳膩膨臻興艘艙蕊蕙蕈蕨蕩蕃蕉蕭蕪蕞螃螟螞螢融衡褪褲褥褫褡親覦諦諺諫諱謀諜諧諮諾謁謂諷諭諳諶諼豫豭貓賴蹄踱踴蹂踹踵輻輯輸輳辨辦遵遴選遲遼遺鄴醒錠錶鋸錳錯錢鋼錫錄錚錐錦錡錕錮錙閻隧隨險雕霎霑霖霍霓霏靛靜靦鞘頰頸頻頷頭頹頤餐館餞餛餡餚駭駢駱骸骼髻髭鬨鮑鴕鴣鴦鴨鴒鴛默黔龍龜優償儡儲勵嚎嚀嚐嚅嚇嚏壕壓壑壎嬰嬪嬤孺尷屨嶼嶺嶽嶸幫彌徽應懂懇懦懋戲戴擎擊擘擠擰擦擬擱擢擭斂斃曙曖檀檔檄檢檜櫛檣橾檗檐檠歜殮毚氈濘濱濟濠濛濤濫濯澀濬濡濩濕濮濰燧營燮燦燥燭燬燴燠爵牆獰獲璩環璦璨癆療癌盪瞳瞪瞰瞬瞧瞭矯磷磺磴磯礁禧禪穗窿簇簍篾篷簌篠糠糜糞糢糟糙糝縮績繆縷縲繃縫總縱繅繁縴縹繈縵縿縯罄翳翼聱聲聰聯聳臆臃膺臂臀膿膽臉膾臨舉艱薪薄蕾薜薑薔薯薛薇薨薊虧蟀蟑螳蟒蟆螫螻螺蟈蟋褻褶襄褸褽覬謎謗謙講謊謠謝謄謐豁谿豳賺賽購賸賻趨蹉蹋蹈蹊轄輾轂轅輿避遽還邁邂邀鄹醣醞醜鍍鎂錨鍵鍊鍥鍋錘鍾鍬鍛鍰鍚鍔闊闋闌闈闆隱隸雖霜霞鞠韓顆颶餵騁駿鮮鮫鮪鮭鴻鴿麋黏點黜黝黛鼾齋叢嚕嚮壙壘嬸彝懣戳擴擲擾攆擺擻擷斷曜朦檳檬櫃檻檸櫂檮檯歟歸殯瀉瀋濾瀆濺瀑瀏燻燼燾燸獷獵璧璿甕癖癘癒瞽瞿瞻瞼礎禮穡穢穠竄竅簫簧簪簞簣簡糧織繕繞繚繡繒繙罈翹翻職聶臍臏舊藏薩藍藐藉薰薺薹薦蟯蟬蟲蟠覆覲觴謨謹謬謫豐贅蹙蹣蹦蹤蹟蹕軀轉轍邇邃邈醫醬釐鎔鎊鎖鎢鎳鎮鎬鎰鎘鎚鎗闔闖闐闕離雜雙雛雞霤鞣鞦鞭韹額顏題顎顓颺餾餿餽餮馥騎髁鬃鬆魏魎魍鯊鯉鯽鯈鯀鵑鵝鵠黠鼕鼬儳嚥壞壟壢寵龐廬懲懷懶懵攀攏曠曝櫥櫝櫚櫓瀛瀟瀨瀚瀝瀕瀘爆爍牘犢獸獺璽瓊瓣疇疆癟癡矇礙禱穫穩簾簿簸簽簷籀繫繭繹繩繪羅繳羶羹羸臘藩藝藪藕藤藥藷蟻蠅蠍蟹蟾襠襟襖襞譁譜識證譚譎譏譆譙贈贊蹼蹲躇蹶蹬蹺蹴轔轎辭邊邋醱醮鏡鏑鏟鏃鏈鏜鏝鏖鏢鏍鏘鏤鏗鏨關隴難霪霧靡韜韻類願顛颼饅饉騖騙鬍鯨鯧鯖鯛鶉鵡鵲鵪鵬麒麗麓麴勸嚨嚷嚶嚴嚼壤孀孃孽寶巉懸懺攘攔攙曦朧櫬瀾瀰瀲爐獻瓏癢癥礦礪礬礫竇競籌籃籍糯糰辮繽繼纂罌耀臚艦藻藹蘑藺蘆蘋蘇蘊蠔蠕襤覺觸議譬警譯譟譫贏贍躉躁躅躂醴釋鐘鐃鏽闡霰飄饒饑馨騫騰騷騵鰓鰍鹹麵黨鼯齟齣齡儷儸囁囀囂夔屬巍懼懾攝攜斕曩櫻欄櫺殲灌爛犧瓖瓔癩矓籐纏續羼蘗蘭蘚蠣蠢蠡蠟襪襬覽譴護譽贓躊躍躋轟辯醺鐮鐳鐵鐺鐸鐲鐫闢霸霹露響顧顥饗驅驃驀騾髏魔魑鰭鰥鶯鶴鷂鶸麝黯鼙齜齦齧儼儻囈囊囉孿巔巒彎懿攤權歡灑灘玀瓤疊癮癬禳籠籟聾聽臟襲襯觼讀贖贗躑躓轡酈鑄鑑鑒霽霾韃韁顫饕驕驍髒鬚鱉鰱鰾鰻鷓鷗鼴齬齪龔囌巖戀攣攫攪曬欐瓚竊籤籣籥纓纖纔臢蘸蘿蠱變邐邏鑣鑠鑤靨顯饜驚驛驗髓體髑鱔鱗鱖鷥麟黴囑壩攬灞癱癲矗罐羈蠶蠹衢讓讒讖艷贛釀鑪靂靈靄韆顰驟鬢魘鱟鷹鷺鹼鹽鼇齷齲廳欖灣籬籮蠻觀躡釁鑲鑰顱饞髖鬣黌灤矚讚鑷韉驢驥纜讜躪釅鑽鑾鑼鱷鱸黷豔鑿鸚爨驪鬱鸛鸞籲乂乜凵匚厂万丌乇亍囗屮彳丏冇与丮亓仂仉仈冘勼卬厹圠夃夬尐巿旡殳毌气爿丱丼仨仜仩仡仝仚刌匜卌圢圣夗夯宁宄尒尻屴屳帄庀庂忉戉扐氕氶汃氿氻犮犰玊禸肊阞伎优伬仵伔仱伀价伈伝伂伅伢伓伄仴伒冱刓刉刐劦匢匟卍厊吇囡囟圮圪圴夼妀奼妅奻奾奷奿孖尕尥屼屺屻屾巟幵庄异弚彴忕忔忏扜扞扤扡扦扢扙扠扚扥旯旮朾朹朸朻机朿朼朳氘汆汒汜汏汊汔汋汌灱牞犴犵玎甪癿穵网艸艼芀艽艿虍襾邙邗邘邛邔阢阤阠阣佖伻佢佉体佤伾佧佒佟佁佘伭伳伿佡冏冹刜刞刡劭劮匉卣卲厎厏吰吷吪呔呅吙吜吥吘吽呏呁吨吤呇囮囧囥坁坅坌坉坋坒夆奀妦妘妠妗妎妢妐妏妧妡宎宒尨尪岍岏岈岋岉岒岊岆岓岕巠帊帎庋庉庌庈庍弅弝彸彶忒忑忐忭忨忮忳忡忤忣忺忯忷忻怀忴戺抃抌抎抏抔抇扱扻扺扰抁抈扷扽扲扴攷旰旴旳旲旵杅杇杙杕杌杈杝杍杚杋毐氙氚汸汧汫沄沋沏汱汯汩沚汭沇沕沜汦汳汥汻沎灴灺牣犿犽狃狆狁犺狅玕玗玓玔玒町甹疔疕皁礽耴肕肙肐肒肜芐芏芅芎芑芓芊芃芄豸迉辿邟邡邥邞邧邠阰阨阯阭丳侘佼侅佽侀侇佶佴侉侄佷佌侗佪侚佹侁佸侐侜侔侞侒侂侕佫佮冞冼冾刵刲刳剆刱劼匊匋匼厒厔咇呿咁咑咂咈呫呺呾呥呬呴呦咍呯呡呠咘呣呧呤囷囹坯坲坭坫坱坰坶垀坵坻坳坴坢坨坽夌奅妵妺姏姎妲姌姁妶妼姃姖妱妽姀姈妴姇孢孥宓宕屄屇岮岤岠岵岯岨岬岟岣岭岢岪岧岝岥岶岰岦帗帔帙弨弢弣弤彔徂彾彽忞忥怭怦怙怲怋怴怊怗怳怚怞怬怢怍怐怮怓怑怌怉怜戔戽抭抴拑抾抪抶拊抮抳抯抻抩抰抸攽斨斻昉旼昄昒昈旻昃昋昍昅旽昑昐曶朊枅杬枎枒杶杻枘枆构杴枍枌杺枟枑枙枃杽极杸杹枔欥殀歾毞氝沓泬泫泮泙沶泔沭泧沷泐泂沺泃泆泭泲泒泝沴沊沝沀泞泀洰泍泇沰泹泏泩泑炔炘炅炓炆炄炑炖炂炚炃牪狖狋狘狉狜狒狔狚狌狑玤玡玭玦玢玠玬玝瓝瓨甿畀甾疌疘皯盳盱盰盵矸矼矹矻矺矷祂礿秅穸穻竻籵糽耵肏肮肣肸肵肭舠芠苀芫芚芘芛芵芧芮芼芞芺芴芨芡芩苂芤苃芶芢虰虯虭虮豖迒迋迓迍迖迕迗邲邴邯邳邰阹阽阼阺陃俍俅俓侲俉俋俁俔俜俙侻侳俛俇俖侺俀侹俬剄剉勀勂匽卼厗厖厙厘咺咡咭咥哏哃茍咷咮哖咶哅哆咠呰咼咢咾呲哞咰垵垞垟垤垌垗垝垛垔垘垏垙垥垚垕壴复奓姡姞姮娀姱姝姺姽姼姶姤姲姷姛姩姳姵姠姾姴姭宨屌峐峘峌峗峋峛峞峚峉峇峊峖峓峔峏峈峆峎峟峸巹帡帢帣帠帤庰庤庢庛庣庥弇弮彖徆怷怹恔恲恞恅恓恇恉恛恌恀恂恟怤恄恘恦恮扂扃拏挍挋拵挎挃拫拹挏挌拸拶挀挓挔拺挕拻拰敁敃斪斿昶昡昲昵昜昦昢昳昫昺昝昴昹昮朏朐柁柲柈枺柜枻柸柘柀枷柅柫柤柟枵柍枳柷柶柮柣柂枹柎柧柰枲柼柆柭柌枮柦柛柺柉柊柃柪柋欨殂殄殶毖毘毠氠氡洨洴洭洟洼洿洒洊泚洳洄洙洺洚洑洀洝浂洁洘洷洃洏浀洇洠洬洈洢洉洐炷炟炾炱炰炡炴炵炩牁牉牊牬牰牳牮狊狤狨狫狟狪狦狣玅珌珂珈珅玹玶玵玴珫玿珇玾珃珆玸珋瓬瓮甮畇畈疧疪癹盄眈眃眄眅眊盷盻盺矧矨砆砑砒砅砐砏砎砉砃砓祊祌祋祅祄秕种秏秖秎窀穾竑笀笁籺籸籹籿粀粁紃紈紁罘羑羍羾耇耎耏耔耷胘胇胠胑胈胂胐胅胣胙胜胊胕胉胏胗胦胍臿舡芔苙苾苹茇苨茀苕茺苫苖苴苬苡苲苵茌苻苶苰苪苤苠苺苳苭虷虴虼虳衁衎衧衪衩觓訄訇赲迣迡迮迠郱邽邿郕郅邾郇郋郈釔釓陔陏陑陓陊陎倞倅倇倓倢倰倛俵俴倳倷倬俶俷倗倜倠倧倵倯倱倎党冔冓凊凄凅凈凎剡剚剒剞剟剕剢勍匎厞唦哢唗唒哧哳哤唚哿唄唈哫唑唅哱唊哻哷哸哠唎唃唋圁圂埌堲埕埒垺埆垽垼垸垶垿埇埐垹埁夎奊娙娖娭娮娕娏娗娊娞娳孬宧宭宬尃屖屔峬峿峮峱峷崀峹帩帨庨庮庪庬弳弰彧恝恚恧恁悢悈悀悒悁悝悃悕悛悗悇悜悎戙扆拲挐捖挬捄捅挶捃揤挹捋捊挼挩捁挴捘捔捙挭捇挳捚捑挸捗捀捈敊敆旆旃旄旂晊晟晇晑朒朓栟栚桉栲栳栻桋桏栖栱栜栵栫栭栯桎桄栴栝栒栔栦栨栮桍栺栥栠欬欯欭欱欴歭肂殈毦毤毨毣毢毧氥浺浣浤浶洍浡涒浘浢浭浯涑涍淯浿涆浞浧浠涗浰浼浟涂涘洯浨涋浾涀涄洖涃浻浽浵涐烜烓烑烝烋缹烢烗烒烞烠烔烍烅烆烇烚烎烡牂牸牷牶猀狺狴狾狶狳狻猁珓珙珥珖玼珧珣珩珜珒珛珔珝珚珗珘珨瓞瓟瓴瓵甡畛畟疰痁疻痄痀疿疶疺皊盉眝眛眐眓眒眣眑眕眙眚眢眧砣砬砢砵砯砨砮砫砡砩砳砪砱祔祛祏祜祓祒祑秫秬秠秮秭秪秜秞秝窆窉窅窋窌窊窇竘笐笄笓笅笏笈笊笎笉笒粄粑粊粌粈粍粅紞紝紑紎紘紖紓紟紒紏紌罜罡罞罠罝罛羖羒翃翂翀耖耾耹胺胲胹胵脁胻脀舁舯舥茳茭荄茙荑茥荖茿荁茦茜茢荂荎茛茪茈茼荍茖茤茠茷茯茩荇荅荌荓茞茬荋茧荈虓虒蚢蚨蚖蚍蚑蚞蚇蚗蚆蚋蚚蚅蚥蚙蚡蚧蚕蚘蚎蚝蚐蚔衃衄衭衵衶衲袀衱衿衯袃衾衴衼訒豇豗豻貤貣赶赸趵趷趶軑軓迾迵适迿迻逄迼迶郖郠郙郚郣郟郥郘郛郗郜郤酐酎酏釕釢釚陜陟隼飣髟鬯乿偰偪偡偞偠偓偋偝偲偈偍偁偛偊偢倕偅偟偩偫偣偤偆偀偮偳偗偑凐剫剭剬剮勖勓匭厜啵啶唼啍啐唴唪啑啢唶唵唰啒啅唌唲啥啎唹啈唭唻啀啋圊圇埻堔埢埶埜埴堀埭埽堈埸堋埳埏堇埮埣埲埥埬埡堎埼堐埧堁堌埱埩埰堍堄奜婠婘婕婧婞娸娵婭婐婟婥婬婓婤婗婃婝婒婄婛婈媎娾婍娹婌婰婩婇婑婖婂婜孲孮寁寀屙崞崋崝崚崠崌崨崍崦崥崏崰崒崣崟崮帾帴庱庴庹庲庳弶弸徛徖徟悊悐悆悾悰悺惓惔惏惤惙惝惈悱惛悷惊悿惃惍惀挲捥掊掂捽掽掞掭掝掗掫掎捯掇掐据掯捵掜捭掮捼掤挻掟捸掅掁掑掍捰敓旍晥晡晛晙晜晢朘桹梇梐梜桭桮梮梫楖桯梣梬梩桵桴梲梏桷梒桼桫桲梪梀桱桾梛梖梋梠梉梤桸桻梑梌梊桽欶欳欷欸殑殏殍殎殌氪淀涫涴涳湴涬淩淢涷淶淔渀淈淠淟淖涾淥淜淝淛淴淊涽淭淰涺淕淂淏淉淐淲淓淽淗淍淣涻烺焍烷焗烴焌烰焄烳焐烼烿焆焓焀烸烶焋焂焎牾牻牼牿猝猗猇猑猘猊猈狿猏猞玈珶珸珵琄琁珽琇琀珺珼珿琌琋珴琈畤畣痎痒痏痋痌痑痐皏皉盓眹眯眭眱眲眴眳眽眥眻眵硈硒硉硍硊硌砦硅硐祤祧祩祪祣祫祡离秺秸秶秷窏窔窐笵筇笴笥笰笢笤笳笘笪笝笱笫笭笯笲笸笚笣粔粘粖粣紵紽紸紶紺絅紬紩絁絇紾紿絊紻紨罣羕羜羝羛翊翋翍翐翑翇翏翉耟耞耛聇聃聈脘脥脙脛脭脟脬脞脡脕脧脝脢舑舸舳舺舴舲艴莐莣莨莍荺荳莤荴莏莁莕莙荵莔莩荽莃莌莝莛莪莋荾莥莯莈莗莰荿莦莇莮荶莚虙虖蚿蚷蛂蛁蛅蚺蚰蛈蚹蚳蚸蛌蚴蚻蚼蛃蚽蚾衒袉袕袨袢袪袚袑袡袟袘袧袙袛袗袤袬袌袓袎覂觖觙觕訰訧訬訞谹谻豜豝豽貥赽赻赹趼跂趹趿跁軘軞軝軜軗軠軡逤逋逑逜逌逡郯郪郰郴郲郳郔郫郬郩酖酘酚酓酕釬釴釱釳釸釤釹釪釫釷釨釮镺閆閈陼陭陫陱陯隿靪頄飥馗傛傕傔傞傋傣傃傌傎傝偨傜傒傂傇兟凔匒匑厤厧喑喨喥喭啷噅喢喓喈喏喵喁喣喒喤啽喌喦啿喕喡喎圌堩堷堙堞堧堣堨埵塈堥堜堛堳堿堶堮堹堸堭堬堻奡媯媔媟婺媢媞婸媦婼媥媬媕媮娷媄媊媗媃媋媩婻婽媌媜媏媓媝寪寍寋寔寑寊寎尌尰崷嵃嵫嵁嵋崿崵嵑嵎嵕崳崺嵒崽崱嵙嵂崹嵉崸崼崲崶嵀嵅幄幁彘徦徥徫惉悹惌惢惎惄愔惲愊愖愅惵愓惸惼惾惁愃愘愝愐惿愄愋扊掔掱掰揎揥揨揯揃撝揳揊揠揶揕揲揵摡揟掾揝揜揄揘揓揂揇揌揋揈揰揗揙攲敧敪敤敜敨敥斌斝斞斮旐旒晼晬晻暀晱晹晪晲朁椌棓椄棜椪棬棪棱椏棖棷棫棤棶椓椐棳棡椇棌椈楰梴椑棯棆椔棸棐棽棼棨椋椊椗棎棈棝棞棦棴棑椆棔棩椕椥棇欹欻欿欼殔殗殙殕殽毰毲毳氰淼湆湇渟湉溈渼渽湅湢渫渿湁湝湳渜渳湋湀湑渻渃渮湞湨湜湡渱渨湠湱湫渹渢渰湓湥渧湸湤湷湕湹湒湦渵渶湚焠焞焯烻焮焱焣焥焢焲焟焨焺焛牋牚犈犉犆犅犋猒猋猰猢猱猳猧猲猭猦猣猵猌琮琬琰琫琖琚琡琭琱琤琣琝琩琠琲瓻甯畯畬痧痚痡痦痝痟痤痗皕皒盚睆睇睄睍睅睊睎睋睌矞矬硠硤硥硜硭硱硪确硰硩硨硞硢祴祳祲祰稂稊稃稌稄窙竦竤筊笻筄筈筌筎筀筘筅粢粞粨粡絘絯絣絓絖絧絪絏絭絜絫絒絔絩絑絟絎缾缿罥罦羢羠羡翗聑聏聐胾胔腃腊腒腏腇脽腍脺臦臮臷臸臹舄舼舽舿艵茻菏菹萣菀菨萒菧菤菼菶萐菆菈菫菣莿萁菝菥菘菿菡菋菎菖菵菉萉萏菞萑萆菂菳菕菺菇菑菪萓菃菬菮菄菻菗菢萛菛菾蛘蛢蛦蛓蛣蛚蛪蛝蛫蛜蛬蛩蛗蛨蛑衈衖衕袺裗袹袸裀袾袶袼袷袽袲褁裉覕覘覗觝觚觛詎詍訹詙詀詗詘詄詅詒詈詑詊詌詏豟貁貀貺貾貰貹貵趄趀趉跘跓跍跇跖跜跏跕跙跈跗跅軯軷軺軹軦軮軥軵軧軨軶軫軱軬軴軩逭逴逯鄆鄬鄄郿郼鄈郹郻鄁鄀鄇鄅鄃酡酤酟酢酠鈁鈊鈥鈃鈚鈦鈏鈌鈀鈒釿釽鈆鈄鈧鈂鈜鈤鈙鈗鈅鈖镻閍閌閐隇陾隈隉隃隀雂雈雃雱雰靬靰靮頇颩飫鳦黹亃亄亶傽傿僆傮僄僊傴僈僂傰僁傺傱僋僉傶傸凗剺剸剻剼嗃嗛嗌嗐嗋嗊嗝嗀嗔嗄嗩喿嗒喍嗏嗕嗢嗖嗈嗲嗍嗙嗂圔塓塨塤塏塍塉塯塕塎塝塙塥塛堽塣塱壼嫇嫄嫋媺媸媱媵媰媿嫈媻嫆媷嫀嫊媴媶嫍媹媐寖寘寙尟尳嵱嵣嵊嵥嵲嵬嵞嵨嵧嵢巰幏幎幊幍幋廅廌廆廋廇彀徯徭惷慉慊愫慅愶愲愮慆愯慏愩慀戠酨戣戥戤揅揱揫搐搒搉搠搤搳摃搟搕搘搹搷搢搣搌搦搰搨摁搵搯搊搚摀搥搧搋揧搛搮搡搎敯斒旓暆暌暕暐暋暊暙暔晸朠楦楟椸楎楢楱椿楅楪椹楂楗楙楺楈楉椵楬椳椽楥棰楸椴楩楀楯楄楶楘楁楴楌椻楋椷楜楏楑椲楒椯楻椼歆歅歃歂歈歁殛毻毼毹毷毸溛滖滈溏滀溟溓溔溠溱溹滆滒溽滁溞滉溷溰滍溦滏溲溾滃滜滘溙溒溎溍溤溡溿溳滐滊溗溮溣煇煔煒煣煠煁煝煢煲煸煪煡煂煘煃煋煰煟煐煓煄煍煚牏犍犌犑犐犎猼獂猻猺獀獊獉瑄瑊瑋瑒瑑瑗瑀瑏瑐瑎瑂瑆瑍瑔瓡瓿瓾瓽甝畹畷榃痯瘏瘃痷痾痼痹痸瘐痻痶痭痵痽皙皵盝睕睟睠睒睖睚睩睧睔睙睭矠碇碚碔碏碄碕碅碆碡碃硹碙碀碖硻祼禂祽祹稑稘稙稒稗稕稢稓稛稐窣窢窞竫筦筤筭筴筩筲筥筳筱筰筡筸筶筣粲粴粯綈綆綀綍絿綅絺綎絻綃絼綌綔綄絽綒罭罫罧罨罬羦羥羧翛翜耡腤腠腷腜腩腛腢腲朡腞腶腧腯腄腡舝艉艄艀艂艅蓱萿葖葶葹蒏蒍葥葑葀蒆葧萰葍葽葚葙葴葳葝蔇葞萷萺萴葺葃葸萲葅萩菙葋萯葂萭葟葰萹葎葌葒葯蓅蒎萻葇萶萳葨葾葄萫葠葔葮葐蜋蜄蛷蜌蛺蛖蛵蝍蛸蜎蜉蜁蛶蜍蜅裖裋裍裎裞裛裚裌裐覅覛觟觥觤觡觠觢觜触詶誆詿詡訿詷誂誄詵誃誁詴詺谼豋豊豥豤豦貆貄貅賌赨赩趑趌趎趏趍趓趔趐趒跰跠跬跱跮跐跩跣跢跧跲跫跴輆軿輁輀輅輇輈輂輋遒逿遄遉逽鄐鄍鄏鄑鄖鄔鄋鄎酮酯鉈鉒鈰鈺鉦鈳鉥鉞銃鈮鉊鉆鉭鉬鉏鉠鉧鉯鈶鉡鉰鈱鉔鉣鉐鉲鉎鉓鉌鉖鈲閟閜閞閛隒隓隑隗雎雺雽雸雵靳靷靸靲頏頍頎颬飶飹馯馲馰馵骭骫魛鳪鳭鳧麀黽僦僔僗僨僳僛僪僝僤僓僬僰僯僣僠凘劀劁勩勫匰厬嘧嘕嘌嘒嗼嘏嘜嘁嘓嘂嗺嘝嘄嗿嗹墉塼墐墘墆墁塿塴墋塺墇墑墎塶墂墈塻墔墏壾奫嫜嫮嫥嫕嫪嫚嫭嫫嫳嫢嫠嫛嫬嫞嫝嫙嫨嫟孷寠寣屣嶂嶀嵽嶆嵺嶁嵷嶊嶉嶈嵾嵼嶍嵹嵿幘幙幓廘廑廗廎廜廕廙廒廔彄彃彯徶愬愨慁慞慱慳慒慓慲慬憀慴慔慺慛慥愻慪慡慖戩戧戫搫摍摛摝摴摶摲摳摽摵摦撦摎撂摞摜摋摓摠摐摿搿摬摫摙摥摷敳斠暡暠暟朅朄朢榱榶槉榠槎榖榰榬榼榑榙榎榧榍榩榾榯榿槄榽榤槔榹槊榚槏榳榓榪榡榞槙榗榐槂榵榥槆歊歍歋殞殟殠毃毄毾滎滵滱漃漥滸漷滻漮漉潎漙漚漧漘漻漒滭漊漶潳滹滮漭潀漰漼漵滫漇漎潃漅滽滶漹漜滼漺漟漍漞漈漡熇熐熉熀熅熂熏煻熆熁熗牄牓犗犕犓獃獍獑獌瑢瑳瑱瑵瑲瑧瑮甀甂甃畽疐瘖瘈瘌瘕瘑瘊瘔皸瞁睼瞅瞂睮瞀睯睾瞃碲碪碴碭碨硾碫碞碥碠碬碢碤禘禊禋禖禕禔禓禗禈禒禐稫穊稰稯稨稦窨窫窬竮箈箜箊箑箐箖箍箌箛箎箅箘劄箙箤箂粻粿粼粺綧綷緂綣綪緁緀緅綝緎緄緆緋緌綯綹綖綼綟綦綮綩綡緉罳翢翣翥翞耤聝聜膉膆膃膇膍膌膋舕蒗蒤蒡蒟蒺蓎蓂蒬蒮蒫蒹蒴蓁蓍蒪蒚蒱蓐蒝蒧蒻蒢蒔蓇蓌蒛蒩蒯蒨蓖蒘蒶蓏蒠蓗蓔蓒蓛蒰蒑虡蜳蜣蜨蝫蝀蜮蜞蜡蜙蜛蝃蜬蝁蜾蝆蜠蜲蜪蜭蜼蜒蜺蜱蜵蝂蜦蜧蜸蜤蜚蜰蜑裷裧裱裲裺裾裮裼裶裻裰裬裫覝覡覟覞觩觫觨誫誙誋誒誏誖谽豨豩賕賏賗趖踉踂跿踍跽踊踃踇踆踅跾踀踄輐輑輎輍鄣鄜鄠鄢鄟鄝鄚鄤鄡鄛酺酲酹酳銥銤鉶銛鉺銠銔銪銍銦銚銫鉹銗鉿銣鋮銎銂銕銢鉽銈銡銊銆銌銙銧鉾銇銩銝銋鈭隞隡雿靘靽靺靾鞃鞀鞂靻鞄鞁靿韎韍頖颭颮餂餀餇馝馜駃馹馻馺駂馽駇骱髣髧鬾鬿魠魡魟鳱鳲鳵麧僿儃儰僸儆儇僶僾儋儌僽儊劋劌勱勯噈噂噌嘵噁噊噉噆噘噚噀嘳嘽嘬嘾嘸嘪嘺圚墫墝墱墠墣墯墬墥墡壿嫿嫴嫽嫷嫶嬃嫸嬂嫹嬁嬇嬅嬏屧嶙嶗嶟嶒嶢嶓嶕嶠嶜嶡嶚嶞幩幝幠幜緳廛廞廡彉徲憋憃慹憱憰憢憉憛憓憯憭憟憒憪憡憍慦憳戭摮摰撖撠撅撗撜撏撋撊撌撣撟摨撱撘敶敺敹敻斲斳暵暰暩暲暷暪暯樀樆樗槥槸樕槱槤樠槿槬槢樛樝槾樧槲槮樔槷槧橀樈槦槻樍槼槫樉樄樘樥樏槶樦樇槴樖歑殥殣殢殦氁氀毿氂潁漦潾澇濆澒澍澉澌潢潏澅潚澖潶潬澂潕潲潒潐潗澔澓潝漀潡潫潽潧澐潓澋潩潿澕潣潷潪潻熲熯熛熰熠熚熩熵熝熥熞熤熡熪熜熧熳犘犚獘獒獞獟獠獝獛獡獚獙獢璇璉璊璆璁瑽璅璈瑼瑹甈甇畾瘥瘞瘙瘝瘜瘣瘚瘨瘛皜皝皞皛瞍瞏瞉瞈磍碻磏磌磑磎磔磈磃磄磉禚禡禠禜禢禛歶稹窲窴窳箷篋箾箬篎箯箹篊箵糅糈糌糋緷緛緪緧緗緡縃緺緦緶緱緰緮緟罶羬羰羭翭翫翪翬翦翨聤聧膣膟膞膕膢膙膗舖艏艓艒艐艎艑蔤蔻蔏蔀蔩蔎蔉蔍蔟蔊蔧蔜蓻蔫蓺蔈蔌蓴蔪蓲蔕蓷蓫蓳蓼蔒蓪蓩蔖蓾蔨蔝蔮蔂蓽蔞蓶蔱蔦蓧蓨蓰蓯蓹蔘蔠蔰蔋蔙蔯虢蝖蝣蝤蝷蟡蝳蝘蝔蝛蝒蝡蝚蝑蝞蝭蝪蝐蝎蝟蝝蝯蝬蝺蝮蝜蝥蝏蝻蝵蝢蝧蝩衚褅褌褔褋褗褘褙褆褖褑褎褉覢覤覣觭觰觬諏諆誸諓諑諔諕誻諗誾諀諅諘諃誺誽諙谾豍貏賥賟賙賨賚賝賧趠趜趡趛踠踣踥踤踮踕踛踖踑踙踦踧踔踒踘踓踜踗踚輬輤輘輚輠輣輖輗遳遰遯遧遫鄯鄫鄩鄪鄲鄦鄮醅醆醊醁醂醄醀鋐鋃鋄鋀鋙銶鋏鋱鋟鋘鋩鋗鋝鋌鋯鋂鋨鋊鋈鋎鋦鋍鋕鋉鋠鋞鋧鋑鋓銵鋡鋆銴镼閬閫閮閰隤隢雓霅霈霂靚鞊鞎鞈韐韏頞頝頦頩頨頠頛頧颲餈飺餑餔餖餗餕駜駍駏駓駔駎駉駖駘駋駗駌骳髬髫髳髲髱魆魃魧魴魱魦魶魵魰魨魤魬鳼鳺鳽鳿鳷鴇鴀鳹鳻鴈鴅鴄麃黓鼏鼐儜儓儗儚儑凞匴叡噰噠噮噳噦噣噭噲噞噷圜圛壈墽壉墿墺壂墼壆嬗嬙嬛嬡嬔嬓嬐嬖嬨嬚嬠嬞寯嶬嶱嶩嶧嶵嶰嶮嶪嶨嶲嶭嶯嶴幧幨幦幯廩廧廦廨廥彋徼憝憨憖懅憴懆懁懌憺憿憸憌擗擖擐擏擉撽撉擃擛擳擙攳敿敼斢曈暾曀曊曋曏暽暻暺曌朣樴橦橉橧樲橨樾橝橭橶橛橑樨橚樻樿橁橪橤橐橏橔橯橩橠樼橞橖橕橍橎橆歕歔歖殧殪殫毈毇氄氃氆澭濋澣濇澼濎濈潞濄澽澞濊澨瀄澥澮澺澬澪濏澿澸澢濉澫濍澯澲澰燅燂熿熸燖燀燁燋燔燊燇燏熽燘熼燆燚燛犝犞獩獦獧獬獥獫獪瑿璚璠璔璒璕璡甋疀瘯瘭瘱瘽瘳瘼瘵瘲瘰皻盦瞚瞝瞡瞜瞛瞢瞣瞕瞙瞗磝磩磥磪磞磣磛磡磢磭磟磠禤穄穈穇窶窸窵窱窷篞篣篧篝篕篥篚篨篹篔篪篢篜篫篘篟糒糔糗糐糑縒縡縗縌縟縠縓縎縜縕縚縢縋縏縖縍縔縥縤罃罻罼罺羱翯耪耩聬膱膦膮膹膵膫膰膬膴膲膷膧臲艕艖艗蕖蕅蕫蕍蕓蕡蕘蕀蕆蕤蕁蕢蕄蕑蕇蕣蔾蕛蕱蕎蕮蕵蕕蕧蕠薌蕦蕝蕔蕥蕬虣虥虤螛螏螗螓螒螈螁螖螘蝹螇螣螅螐螑螝螄螔螜螚螉褞褦褰褭褮褧褱褢褩褣褯褬褟觱諠諢諲諴諵諝謔諤諟諰諈諞諡諨諿諯諻貑貒貐賵賮賱賰賳赬赮趥趧踳踾踸蹀蹅踶踼踽蹁踰踿躽輶輮輵輲輹輷輴遶遹遻邆郺鄳鄵鄶醓醐醑醍醏錧錞錈錟錆錏鍺錸錼錛錣錒錁鍆錭錎錍鋋錝鋺錥錓鋹鋷錴錂錤鋿錩錹錵錪錔錌錋鋾錉錀鋻錖閼闍閾閹閺閶閿閵閽隩雔霋霒霐鞙鞗鞔韰韸頵頯頲餤餟餧餩馞駮駬駥駤駰駣駪駩駧骹骿骴骻髶髺髹髷鬳鮀鮅鮇魼魾魻鮂鮓鮒鮐魺鮕魽鮈鴥鴗鴠鴞鴔鴩鴝鴘鴢鴐鴙鴟麈麆麇麮麭黕黖黺鼒鼽儦儥儢儤儠儩勴嚓嚌嚍嚆嚄嚃噾嚂噿嚁壖壔壏壒嬭嬥嬲嬣嬬嬧嬦嬯嬮孻寱寲嶷幬幪徾徻懃憵憼懧懠懥懤懨懞擯擩擣擫擤擨斁斀斶旚曒檍檖檁檥檉檟檛檡檞檇檓檎檕檃檨檤檑橿檦檚檅檌檒歛殭氉濌澩濴濔濣濜濭濧濦濞濲濝濢濨燡燱燨燲燤燰燢獳獮獯璗璲璫璐璪璭璱璥璯甐甑甒甏疄癃癈癉癇皤盩瞵瞫瞲瞷瞶瞴瞱瞨矰磳磽礂磻磼磲礅磹磾礄禫禨穜穛穖穘穔穚窾竀竁簅簏篲簀篿篻簎篴簋篳簂簉簃簁篸篽簆篰篱簐簊糨縭縼繂縳顈縸縪繉繀繇縩繌縰縻縶繄縺罅罿罾罽翴翲耬膻臄臌臊臅臇膼臩艛艚艜薃薀薏薧薕薠薋薣蕻薤薚薞蕷蕼薉薡蕺蕸蕗薎薖薆薍薙薝薁薢薂薈薅蕹蕶薘薐薟虨螾螪螭蟅螰螬螹螵螼螮蟉蟃蟂蟌螷螯蟄蟊螴螶螿螸螽蟞螲褵褳褼褾襁襒褷襂覭覯覮觲觳謞謘謖謑謅謋謢謏謒謕謇謍謈謆謜謓謚豏豰豲豱豯貕貔賹赯蹎蹍蹓蹐蹌蹇轃轀邅遾鄸醚醢醛醙醟醡醝醠鎡鎃鎯鍤鍖鍇鍼鍘鍜鍶鍉鍐鍑鍠鍭鎏鍌鍪鍹鍗鍕鍒鍏鍱鍷鍻鍡鍞鍣鍧鎀鍎鍙闇闀闉闃闅閷隮隰隬霠霟霘霝霙鞚鞡鞜鞞鞝韕韔韱顁顄顊顉顅顃餥餫餬餪餳餲餯餭餱餰馘馣馡騂駺駴駷駹駸駶駻駽駾駼騃骾髾髽鬁髼魈鮚鮨鮞鮛鮦鮡鮥鮤鮆鮢鮠鮯鴳鵁鵧鴶鴮鴯鴱鴸鴰鵅鵂鵃鴾鴷鵀鴽翵鴭麊麉麍麰黈黚黻黿鼤鼣鼢齔龠儱儭儮嚘嚜嚗嚚嚝嚙奰嬼屩屪巀幭幮懘懟懭懮懱懪懰懫懖懩擿攄擽擸攁攃擼斔旛曚曛曘櫅檹檽櫡櫆檺檶檷櫇檴檭歞毉氋瀇瀌瀍瀁瀅瀔瀎濿瀀濻瀦濼濷瀊爁燿燹爃燽獶璸瓀璵瓁璾璶璻瓂甔甓癜癤癙癐癓癗癚皦皽盬矂瞺磿礌礓礔礉礐礒礑禭禬穟簜簩簙簠簟簭簝簦簨簢簥簰繜繐繖繣繘繢繟繑繠繗繓羵羳翷翸聵臑臒臐艟艞薴藆藀藃藂薳薵薽藇藄薿藋藎藈藅薱薶藒蘤薸薷薾虩蟧蟦蟢蟛蟫蟪蟥蟟蟳蟤蟔蟜蟓蟭蟘蟣螤蟗蟙蠁蟴蟨蟝襓襋襏襌襆襐襑襉謪謧謣謳謰謵譇謯謼謾謱謥謷謦謶謮謤謻謽謺豂豵貙貘貗賾贄贂贀蹜蹢蹠蹗蹖蹞蹥蹧蹛蹚蹡蹝蹩蹔轆轇轈轋鄨鄺鄻鄾醨醥醧醯醪鎵鎌鎒鎷鎛鎝鎉鎧鎎鎪鎞鎦鎕鎈鎙鎟鎍鎱鎑鎲鎤鎨鎴鎣鎥闒闓闑隳雗雚巂雟雘雝霣霢霥鞬鞮鞨鞫鞤鞪鞢鞥韗韙韖韘韺顐顑顒颸饁餼餺騏騋騉騍騄騑騊騅騇騆髀髜鬈鬄鬅鬩鬵魊魌魋鯇鯆鯃鮿鯁鮵鮸鯓鮶鯄鮹鮽鵜鵓鵏鵊鵛鵋鵙鵖鵌鵗鵒鵔鵟鵘鵚麎麌黟鼁鼀鼖鼥鼫鼪鼩鼨齌齕儴儵劖勷厴嚫嚭嚦嚧嚪嚬壚壝壛夒嬽嬾嬿巃幰徿懻攇攐攍攉攌攎斄旞旝曞櫧櫠櫌櫑櫙櫋櫟櫜櫐櫫櫏櫍櫞歠殰氌瀙瀧瀠瀖瀫瀡瀢瀣瀩瀗瀤瀜瀪爌爊爇爂爅犥犦犤犣犡瓋瓅璷瓃甖癠矉矊矄矱礝礛礡礜礗礞禰穧穨簳簼簹簬簻糬糪繶繵繸繰繷繯繺繲繴繨罋罊羃羆羷翽翾聸臗臕艤艡艣藫藱藭藙藡藨藚藗藬藲藸藘藟藣藜藑藰藦藯藞藢蠀蟺蠃蟶蟷蠉蠌蠋蠆蟼蠈蟿蠊蠂襢襚襛襗襡襜襘襝襙覈覷覶觶譐譈譊譀譓譖譔譋譕譑譂譒譗豃豷豶貚贆贇贉趬趪趭趫蹭蹸蹳蹪蹯蹻軂轒轑轏轐轓辴酀鄿醰醭鏞鏇鏏鏂鏚鏐鏹鏬鏌鏙鎩鏦鏊鏔鏮鏣鏕鏄鏎鏀鏒鏧镽闚闛雡霩霫霬霨霦鞳鞷鞶韝韞韟顜顙顝顗颿颽颻颾饈饇饃馦馧騚騕騥騝騤騛騢騠騧騣騞騜騔髂鬋鬊鬎鬌鬷鯪鯫鯠鯞鯤鯦鯢鯰鯔鯗鯬鯜鯙鯥鯕鯡鯚鵷鶁鶊鶄鶈鵱鶀鵸鶆鶋鶌鵽鵫鵴鵵鵰鵩鶅鵳鵻鶂鵯鵹鵿鶇鵨麔麑黀黼鼭齀齁齍齖齗齘匷嚲嚵嚳壣孅巆巇廮廯忀忁懹攗攖攕攓旟曨曣曤櫳櫰櫪櫨櫹櫱櫮櫯瀼瀵瀯瀷瀴瀱灂瀸瀿瀺瀹灀瀻瀳灁爓爔犨獽獼璺皫皪皾盭矌矎矏矍矲礥礣礧礨礤礩禲穮穬穭竷籉籈籊籇籅糮繻繾纁纀羺翿聹臛臙舋艨艩蘢藿蘁藾蘛蘀藶蘄蘉蘅蘌藽蠙蠐蠑蠗蠓蠖襣襦覹觷譠譪譝譨譣譥譧譭趮躆躈躄轙轖轗轕轘轚邍酃酁醷醵醲醳鐋鐓鏻鐠鐏鐔鏾鐕鐐鐨鐙鐍鏵鐀鏷鐇鐎鐖鐒鏺鐉鏸鐊鏿鏼鐌鏶鐑鐆闞闠闟霮霯鞹鞻韽韾顠顢顣顟飁飂饐饎饙饌饋饓騲騴騱騬騪騶騩騮騸騭髇髊髆鬐鬒鬑鰋鰈鯷鰅鰒鯸鱀鰇鰎鰆鰗鰔鰉鶟鶙鶤鶝鶒鶘鶐鶛鶠鶔鶜鶪鶗鶡鶚鶢鶨鶞鶣鶿鶩鶖鶦鶧麙麛麚黥黤黧黦鼰鼮齛齠齞齝齙龑儺儹劘劗囃嚽嚾孈孇巋巏廱懽攛欂櫼欃櫸欀灃灄灊灈灉灅灆爝爚爙獾甗癪矐礭礱礯籔籓糲纊纇纈纋纆纍罍羻耰臝蘘蘪蘦蘟蘣蘜蘙蘧蘮蘡蘠蘩蘞蘥蠩蠝蠛蠠蠤蠜蠫衊襭襩襮襫觺譹譸譅譺譻贐贔趯躎躌轞轛轝酆酄酅醹鐿鐻鐶鐩鐽鐼鐰鐹鐪鐷鐬鑀鐱闥闤闣霵霺鞿韡顤飉飆飀饘饖騹騽驆驄驂驁騺騿髍鬕鬗鬘鬖鬺魒鰫鰝鰜鰬鰣鰨鰩鰤鰡鶷鶶鶼鷁鷇鷊鷏鶾鷅鷃鶻鶵鷎鶹鶺鶬鷈鶱鶭鷌鶳鷍鶲鹺麜黫黮黭鼛鼘鼚鼱齎齥齤龒亹囆囅囋奱孋孌巕巑廲攡攠攦攢欋欈欉氍灕灖灗灒爞爟犩獿瓘瓕瓙瓗癭皭礵禴穰穱籗籜籙籛籚糴糱纑罏羇臞艫蘴蘵蘳蘬蘲蘶蠬蠨蠦蠪蠥襱覿覾觻譾讄讂讆讅譿贕躕躔躚躒躐躖躗轠轢酇鑌鑐鑊鑋鑏鑇鑅鑈鑉鑆霿韣顪顩飋饔饛驎驓驔驌驏驈驊驉驒驐髐鬙鬫鬻魖魕鱆鱈鰿鱄鰹鰳鱁鰼鰷鰴鰲鰽鰶鷛鷒鷞鷚鷋鷐鷜鷑鷟鷩鷙鷘鷖鷵鷕鷝麶黰鼵鼳鼲齂齫龕龢儽劙壨壧奲孍巘蠯彏戁戃戄攩攥斖曫欑欒欏毊灛灚爢玂玁玃癰矔籧籦纕艬蘺虀蘹蘼蘱蘻蘾蠰蠲蠮蠳襶襴襳觾讌讎讋讈豅贙躘轤轣醼鑢鑕鑝鑗鑞韄韅頀驖驙鬞鬟鬠鱒鱘鱐鱊鱍鱋鱕鱙鱌鱎鷻鷷鷯鷣鷫鷸鷤鷶鷡鷮鷦鷲鷰鷢鷬鷴鷳鷨鷭黂黐黲黳鼆鼜鼸鼷鼶齃齏齱齰齮齯囓囍孎屭攭曭曮欓灟灡灝灠爣瓛瓥矕礸禷禶籪纗羉艭虃蠸蠷蠵衋讔讕躞躟躠躝醾醽釂鑫鑨鑩雥靆靃靇韇韥驞髕魙鱣鱧鱦鱢鱞鱠鸂鷾鸇鸃鸆鸅鸀鸁鸉鷿鷽鸄麠鼞齆齴齵齶囔攮斸欘欙欗欚灢爦犪矘矙礹籩籫糶纚纘纛纙臠臡虆虇虈襹襺襼襻觿讘讙躥躤躣鑮鑭鑯鑱鑳靉顲饟鱨鱮鱭鸋鸍鸐鸏鸒鸑麡黵鼉齇齸齻齺齹圞灦籯蠼趲躦釃鑴鑸鑶鑵驠鱴鱳鱱鱵鸔鸓黶鼊龤灨灥糷虪蠾蠽蠿讞貜躩軉靋顳顴飌饡馫驤驦驧鬤鸕鸗齈戇欞爧虌躨钂钀钁驩驨鬮鸙爩虋讟钃鱹麷癵驫鱺鸝灩灪麤齾齉龘"
}
- Version{"35"}
+ Version{"35.1"}
}
default{"pinyin"}
gb2312han{
@@ -18,7 +18,7 @@
"[reorder Latn Hani]"
"&[last regular]<*啊阿埃挨哎唉哀皑癌蔼矮艾碍爱隘鞍氨安俺按暗岸胺案肮昂盎凹敖熬翱袄傲奥懊澳芭捌扒叭吧笆八疤巴拔跋靶把耙坝霸罢爸白柏百摆佰败拜稗斑班搬扳般颁板版扮拌伴瓣半办绊邦帮梆榜膀绑棒磅蚌镑傍谤苞胞包褒剥薄雹保堡饱宝抱报暴豹鲍爆杯碑悲卑北辈背贝钡倍狈备惫焙被奔苯本笨崩绷甭泵蹦迸逼鼻比鄙笔彼碧蓖蔽毕毙毖币庇痹闭敝弊必辟壁臂避陛鞭边编贬扁便变卞辨辩辫遍标彪膘表鳖憋别瘪彬斌濒滨宾摈兵冰柄丙秉饼炳病并玻菠播拨钵波博勃搏铂箔伯帛舶脖膊渤泊驳捕卜哺补埠不布步簿部怖擦猜裁材才财睬踩采彩菜蔡餐参蚕残惭惨灿苍舱仓沧藏操糙槽曹草厕策侧册测层蹭插叉茬茶查碴搽察岔差诧拆柴豺搀掺蝉馋谗缠铲产阐颤昌猖场尝常长偿肠厂敞畅唱倡超抄钞朝嘲潮巢吵炒车扯撤掣彻澈郴臣辰尘晨忱沉陈趁衬撑称城橙成呈乘程惩澄诚承逞骋秤吃痴持匙池迟弛驰耻齿侈尺赤翅斥炽充冲虫崇宠抽酬畴踌稠愁筹仇绸瞅丑臭初出橱厨躇锄雏滁除楚础储矗搐触处揣川穿椽传船喘串疮窗幢床闯创吹炊捶锤垂春椿醇唇淳纯蠢戳绰疵茨磁雌辞慈瓷词此刺赐次聪葱囱匆从丛凑粗醋簇促蹿篡窜摧崔催脆瘁粹淬翠村存寸磋撮搓措挫错搭达答瘩打大呆歹傣戴带殆代贷袋待逮怠耽担丹单郸掸胆旦氮但惮淡诞弹蛋当挡党荡档刀捣蹈倒岛祷导到稻悼道盗德得的蹬灯登等瞪凳邓堤低滴迪敌笛狄涤翟嫡抵底地蒂第帝弟递缔颠掂滇碘点典靛垫电佃甸店惦奠淀殿碉叼雕凋刁掉吊钓调跌爹碟蝶迭谍叠丁盯叮钉顶鼎锭定订丢东冬董懂动栋侗恫冻洞兜抖斗陡豆逗痘都督毒犊独读堵睹赌杜镀肚度渡妒端短锻段断缎堆兑队对墩吨蹲敦顿囤钝盾遁掇哆多夺垛躲朵跺舵剁惰堕蛾峨鹅俄额讹娥恶厄扼遏鄂饿恩而儿耳尔饵洱二贰发罚筏伐乏阀法珐藩帆番翻樊矾钒繁凡烦反返范贩犯饭泛坊芳方肪房防妨仿访纺放菲非啡飞肥匪诽吠肺废沸费芬酚吩氛分纷坟焚汾粉奋份忿愤粪丰封枫蜂峰锋风疯烽逢冯缝讽奉凤佛否夫敷肤孵扶拂辐幅氟符伏俘服浮涪福袱弗甫抚辅俯釜斧脯腑府腐赴副覆赋复傅付阜父腹负富讣附妇缚咐噶嘎该改概钙盖溉干甘杆柑竿肝赶感秆敢赣冈刚钢缸肛纲岗港杠篙皋高膏羔糕搞镐稿告哥歌搁戈鸽胳疙割革葛格蛤阁隔铬个各给根跟耕更庚羹埂耿梗工攻功恭龚供躬公宫弓巩汞拱贡共钩勾沟苟狗垢构购够辜菇咕箍估沽孤姑鼓古蛊骨谷股故顾固雇刮瓜剐寡挂褂乖拐怪棺关官冠观管馆罐惯灌贯光广逛瑰规圭硅归龟闺轨鬼诡癸桂柜跪贵刽辊滚棍锅郭国果裹过哈骸孩海氦亥害骇酣憨邯韩含涵寒函喊罕翰撼捍旱憾悍焊汗汉夯杭航壕嚎豪毫郝好耗号浩呵喝荷菏核禾和何合盒貉阂河涸赫褐鹤贺嘿黑痕很狠恨哼亨横衡恒轰哄烘虹鸿洪宏弘红喉侯猴吼厚候后呼乎忽瑚壶葫胡蝴狐糊湖弧虎唬护互沪户花哗华猾滑画划化话槐徊怀淮坏欢环桓还缓换患唤痪豢焕涣宦幻荒慌黄磺蝗簧皇凰惶煌晃幌恍谎灰挥辉徽恢蛔回毁悔慧卉惠晦贿秽会烩汇讳诲绘荤昏婚魂浑混豁活伙火获或惑霍货祸击圾基机畸稽积箕肌饥迹激讥鸡姬绩缉吉极棘辑籍集及急疾汲即嫉级挤几脊己蓟技冀季伎祭剂悸济寄寂计记既忌际妓继纪嘉枷夹佳家加荚颊贾甲钾假稼价架驾嫁歼监坚尖笺间煎兼肩艰奸缄茧检柬碱硷拣捡简俭剪减荐槛鉴践贱见键箭件健舰剑饯渐溅涧建僵姜将浆江疆蒋桨奖讲匠酱降蕉椒礁焦胶交郊浇骄娇嚼搅铰矫侥脚狡角饺缴绞剿教酵轿较叫窖揭接皆秸街阶截劫节桔杰捷睫竭洁结解姐戒藉芥界借介疥诫届巾筋斤金今津襟紧锦仅谨进靳晋禁近烬浸尽劲荆兢茎睛晶鲸京惊精粳经井警景颈静境敬镜径痉靖竟竞净炯窘揪究纠玖韭久灸九酒厩救旧臼舅咎就疚鞠拘狙疽居驹菊局咀矩举沮聚拒据巨具距踞锯俱句惧炬剧捐鹃娟倦眷卷绢撅攫抉掘倔爵觉决诀绝均菌钧军君峻俊竣浚郡骏喀咖卡咯开揩楷凯慨刊堪勘坎砍看康慷糠扛抗亢炕考拷烤靠坷苛柯棵磕颗科壳咳可渴克刻客课肯啃垦恳坑吭空恐孔控抠口扣寇枯哭窟苦酷库裤夸垮挎跨胯块筷侩快宽款匡筐狂框矿眶旷况亏盔岿窥葵奎魁傀馈愧溃坤昆捆困括扩廓阔垃拉喇蜡腊辣啦莱来赖蓝婪栏拦篮阑兰澜谰揽览懒缆烂滥琅榔狼廊郎朗浪捞劳牢老佬姥酪烙涝勒乐雷镭蕾磊累儡垒擂肋类泪棱楞冷厘梨犁黎篱狸离漓理李里鲤礼莉荔吏栗丽厉励砾历利傈例俐痢立粒沥隶力璃哩俩联莲连镰廉怜涟帘敛脸链恋炼练粮凉梁粱良两辆量晾亮谅撩聊僚疗燎寥辽潦了撂镣廖料列裂烈劣猎琳林磷霖临邻鳞淋凛赁吝拎玲菱零龄铃伶羚凌灵陵岭领另令溜琉榴硫馏留刘瘤流柳六龙聋咙笼窿隆垄拢陇楼娄搂篓漏陋芦卢颅庐炉掳卤虏鲁麓碌露路赂鹿潞禄录陆戮驴吕铝侣旅履屡缕虑氯律率滤绿峦挛孪滦卵乱掠略抡轮伦仑沦纶论萝螺罗逻锣箩骡裸落洛骆络妈麻玛码蚂马骂嘛吗埋买麦卖迈脉瞒馒蛮满蔓曼慢漫谩芒茫盲氓忙莽猫茅锚毛矛铆卯茂冒帽貌贸么玫枚梅酶霉煤没眉媒镁每美昧寐妹媚门闷们萌蒙檬盟锰猛梦孟眯醚靡糜迷谜弥米秘觅泌蜜密幂棉眠绵冕免勉娩缅面苗描瞄藐秒渺庙妙蔑灭民抿皿敏悯闽明螟鸣铭名命谬摸摹蘑模膜磨摩魔抹末莫墨默沫漠寞陌谋牟某拇牡亩姆母墓暮幕募慕木目睦牧穆拿哪呐钠那娜纳氖乃奶耐奈南男难囊挠脑恼闹淖呢馁内嫩能妮霓倪泥尼拟你匿腻逆溺蔫拈年碾撵捻念娘酿鸟尿捏聂孽啮镊镍涅您柠狞凝宁拧泞牛扭钮纽脓浓农弄奴努怒女暖虐疟挪懦糯诺哦欧鸥殴藕呕偶沤啪趴爬帕怕琶拍排牌徘湃派攀潘盘磐盼畔判叛乓庞旁耪胖抛咆刨炮袍跑泡呸胚培裴赔陪配佩沛喷盆砰抨烹澎彭蓬棚硼篷膨朋鹏捧碰坯砒霹批披劈琵毗啤脾疲皮匹痞僻屁譬篇偏片骗飘漂瓢票撇瞥拼频贫品聘乒坪苹萍平凭瓶评屏坡泼颇婆破魄迫粕剖扑铺仆莆葡菩蒲埔朴圃普浦谱曝瀑期欺栖戚妻七凄漆柒沏其棋奇歧畦崎脐齐旗祈祁骑起岂乞企启契砌器气迄弃汽泣讫掐恰洽牵扦钎铅千迁签仟谦乾黔钱钳前潜遣浅谴堑嵌欠歉枪呛腔羌墙蔷强抢橇锹敲悄桥瞧乔侨巧鞘撬翘峭俏窍切茄且怯窃钦侵亲秦琴勤芹擒禽寝沁青轻氢倾卿清擎晴氰情顷请庆琼穷秋丘邱球求囚酋泅趋区蛆曲躯屈驱渠取娶龋趣去圈颧权醛泉全痊拳犬券劝缺炔瘸却鹊榷确雀裙群然燃冉染瓤壤攘嚷让饶扰绕惹热壬仁人忍韧任认刃妊纫扔仍日戎茸蓉荣融熔溶容绒冗揉柔肉茹蠕儒孺如辱乳汝入褥软阮蕊瑞锐闰润若弱撒洒萨腮鳃塞赛三叁伞散桑嗓丧搔骚扫嫂瑟色涩森僧莎砂杀刹沙纱傻啥煞筛晒珊苫杉山删煽衫闪陕擅赡膳善汕扇缮墒伤商赏晌上尚裳梢捎稍烧芍勺韶少哨邵绍奢赊蛇舌舍赦摄射慑涉社设砷申呻伸身深娠绅神沈审婶甚肾慎渗声生甥牲升绳省盛剩胜圣师失狮施湿诗尸虱十石拾时什食蚀实识史矢使屎驶始式示士世柿事拭誓逝势是嗜噬适仕侍释饰氏市恃室视试收手首守寿授售受瘦兽蔬枢梳殊抒输叔舒淑疏书赎孰熟薯暑曙署蜀黍鼠属术述树束戍竖墅庶数漱恕刷耍摔衰甩帅栓拴霜双爽谁水睡税吮瞬顺舜说硕朔烁斯撕嘶思私司丝死肆寺嗣四伺似饲巳松耸怂颂送宋讼诵搜艘擞嗽苏酥俗素速粟僳塑溯宿诉肃酸蒜算虽隋随绥髓碎岁穗遂隧祟孙损笋蓑梭唆缩琐索锁所塌他它她塔獭挞蹋踏胎苔抬台泰酞太态汰坍摊贪瘫滩坛檀痰潭谭谈坦毯袒碳探叹炭汤塘搪堂棠膛唐糖倘躺淌趟烫掏涛滔绦萄桃逃淘陶讨套特藤腾疼誊梯剔踢锑提题蹄啼体替嚏惕涕剃屉天添填田甜恬舔腆挑条迢眺跳贴铁帖厅听烃汀廷停亭庭挺艇通桐酮瞳同铜彤童桶捅筒统痛偷投头透凸秃突图徒途涂屠土吐兔湍团推颓腿蜕褪退吞屯臀拖托脱鸵陀驮驼椭妥拓唾挖哇蛙洼娃瓦袜歪外豌弯湾玩顽丸烷完碗挽晚皖惋宛婉万腕汪王亡枉网往旺望忘妄威巍微危韦违桅围唯惟为潍维苇萎委伟伪尾纬未蔚味畏胃喂魏位渭谓尉慰卫瘟温蚊文闻纹吻稳紊问嗡翁瓮挝蜗涡窝我斡卧握沃巫呜钨乌污诬屋无芜梧吾吴毋武五捂午舞伍侮坞戊雾晤物勿务悟误昔熙析西硒矽晰嘻吸锡牺稀息希悉膝夕惜熄烯溪汐犀檄袭席习媳喜铣洗系隙戏细瞎虾匣霞辖暇峡侠狭下厦夏吓掀锨先仙鲜纤咸贤衔舷闲涎弦嫌显险现献县腺馅羡宪陷限线相厢镶香箱襄湘乡翔祥详想响享项巷橡像向象萧硝霄削哮嚣销消宵淆晓小孝校肖啸笑效楔些歇蝎鞋协挟携邪斜胁谐写械卸蟹懈泄泻谢屑薪芯锌欣辛新忻心信衅星腥猩惺兴刑型形邢行醒幸杏性姓兄凶胸匈汹雄熊休修羞朽嗅锈秀袖绣墟戌需虚嘘须徐许蓄酗叙旭序畜恤絮婿绪续轩喧宣悬旋玄选癣眩绚靴薛学穴雪血勋熏循旬询寻驯巡殉汛训讯逊迅压押鸦鸭呀丫芽牙蚜崖衙涯雅哑亚讶焉咽阉烟淹盐严研蜒岩延言颜阎炎沿奄掩眼衍演艳堰燕厌砚雁唁彦焰宴谚验殃央鸯秧杨扬佯疡羊洋阳氧仰痒养样漾邀腰妖瑶摇尧遥窑谣姚咬舀药要耀椰噎耶爷野冶也页掖业叶曳腋夜液一壹医揖铱依伊衣颐夷遗移仪胰疑沂宜姨彝椅蚁倚已乙矣以艺抑易邑屹亿役臆逸肄疫亦裔意毅忆义益溢诣议谊译异翼翌绎茵荫因殷音阴姻吟银淫寅饮尹引隐印英樱婴鹰应缨莹萤营荧蝇迎赢盈影颖硬映哟拥佣臃痈庸雍踊蛹咏泳涌永恿勇用幽优悠忧尤由邮铀犹油游酉有友右佑釉诱又幼迂淤于盂榆虞愚舆余俞逾鱼愉渝渔隅予娱雨与屿禹宇语羽玉域芋郁吁遇喻峪御愈欲狱育誉浴寓裕预豫驭鸳渊冤元垣袁原援辕园员圆猿源缘远苑愿怨院曰约越跃钥岳粤月悦阅耘云郧匀陨允运蕴酝晕韵孕匝砸杂栽哉灾宰载再在咱攒暂赞赃脏葬遭糟凿藻枣早澡蚤躁噪造皂灶燥责择则泽贼怎增憎曾赠扎喳渣札轧铡闸眨栅榨咋乍炸诈摘斋宅窄债寨瞻毡詹粘沾盏斩辗崭展蘸栈占战站湛绽樟章彰漳张掌涨杖丈帐账仗胀瘴障招昭找沼赵照罩兆肇召遮折哲蛰辙者锗蔗这浙珍斟真甄砧臻贞针侦枕疹诊震振镇阵蒸挣睁征狰争怔整拯正政帧症郑证芝枝支吱蜘知肢脂汁之织职直植殖执值侄址指止趾只旨纸志挚掷至致置帜峙制智秩稚质炙痔滞治窒中盅忠钟衷终种肿重仲众舟周州洲诌粥轴肘帚咒皱宙昼骤珠株蛛朱猪诸诛逐竹烛煮拄瞩嘱主著柱助蛀贮铸筑住注祝驻抓爪拽专砖转撰赚篆桩庄装妆撞壮状椎锥追赘坠缀谆准捉拙卓桌琢茁酌啄着灼浊兹咨资姿滋淄孜紫仔籽滓子自渍字鬃棕踪宗综总纵邹走奏揍租足卒族祖诅阻组钻纂嘴醉最罪尊遵昨左佐柞做作坐座亍丌兀丐廿卅丕亘丞鬲孬噩丨禺丿匕乇夭爻卮氐囟胤馗毓睾鼗丶亟鼐乜乩亓芈孛啬嘏仄厍厝厣厥厮靥赝匚叵匦匮匾赜卦卣刂刈刎刭刳刿剀剌剞剡剜蒯剽劂劁劐劓冂罔亻仃仉仂仨仡仫仞伛仳伢佤仵伥伧伉伫佞佧攸佚佝佟佗伲伽佶佴侑侉侃侏佾佻侪佼侬侔俦俨俪俅俚俣俜俑俟俸倩偌俳倬倏倮倭俾倜倌倥倨偾偃偕偈偎偬偻傥傧傩傺僖儆僭僬僦僮儇儋仝氽佘佥俎龠汆籴兮巽黉馘冁夔勹匍訇匐凫夙兕亠兖亳衮袤亵脔裒禀嬴蠃羸冫冱冽冼凇冖冢冥讠讦讧讪讴讵讷诂诃诋诏诎诒诓诔诖诘诙诜诟诠诤诨诩诮诰诳诶诹诼诿谀谂谄谇谌谏谑谒谔谕谖谙谛谘谝谟谠谡谥谧谪谫谮谯谲谳谵谶卩卺阝阢阡阱阪阽阼陂陉陔陟陧陬陲陴隈隍隗隰邗邛邝邙邬邡邴邳邶邺邸邰郏郅邾郐郄郇郓郦郢郜郗郛郫郯郾鄄鄢鄞鄣鄱鄯鄹酃酆刍奂劢劬劭劾哿勐勖勰叟燮矍廴凵凼鬯厶弁畚巯坌垩垡塾墼壅壑圩圬圪圳圹圮圯坜圻坂坩垅坫垆坼坻坨坭坶坳垭垤垌垲埏垧垴垓垠埕埘埚埙埒垸埴埯埸埤埝堋堍埽埭堀堞堙塄堠塥塬墁墉墚墀馨鼙懿艹艽艿芏芊芨芄芎芑芗芙芫芸芾芰苈苊苣芘芷芮苋苌苁芩芴芡芪芟苄苎芤苡茉苷苤茏茇苜苴苒苘茌苻苓茑茚茆茔茕苠苕茜荑荛荜茈莒茼茴茱莛荞茯荏荇荃荟荀茗荠茭茺茳荦荥荨茛荩荬荪荭荮莰荸莳莴莠莪莓莜莅荼莶莩荽莸荻莘莞莨莺莼菁萁菥菘堇萘萋菝菽菖萜萸萑萆菔菟萏萃菸菹菪菅菀萦菰菡葜葑葚葙葳蒇蒈葺蒉葸萼葆葩葶蒌蒎萱葭蓁蓍蓐蓦蒽蓓蓊蒿蒺蓠蒡蒹蒴蒗蓥蓣蔌甍蔸蓰蔹蔟蔺蕖蔻蓿蓼蕙蕈蕨蕤蕞蕺瞢蕃蕲蕻薤薨薇薏蕹薮薜薅薹薷薰藓藁藜藿蘧蘅蘩蘖蘼廾弈夼奁耷奕奚奘匏尢尥尬尴扌扪抟抻拊拚拗拮挢拶挹捋捃掭揶捱捺掎掴捭掬掊捩掮掼揲揸揠揿揄揞揎摒揆掾摅摁搋搛搠搌搦搡摞撄摭撖摺撷撸撙撺擀擐擗擤擢攉攥攮弋忒甙弑卟叱叽叩叨叻吒吖吆呋呒呓呔呖呃吡呗呙吣吲咂咔呷呱呤咚咛咄呶呦咝哐咭哂咴哒咧咦哓哔呲咣哕咻咿哌哙哚哜咩咪咤哝哏哞唛哧唠哽唔哳唢唣唏唑唧唪啧喏喵啉啭啁啕唿啐唼唷啖啵啶啷唳唰啜喋嗒喃喱喹喈喁喟啾嗖喑啻嗟喽喾喔喙嗪嗷嗉嘟嗑嗫嗬嗔嗦嗝嗄嗯嗥嗲嗳嗌嗍嗨嗵嗤辔嘞嘈嘌嘁嘤嘣嗾嘀嘧嘭噘嘹噗嘬噍噢噙噜噌噔嚆噤噱噫噻噼嚅嚓嚯囔囗囝囡囵囫囹囿圄圊圉圜帏帙帔帑帱帻帼帷幄幔幛幞幡岌屺岍岐岖岈岘岙岑岚岜岵岢岽岬岫岱岣峁岷峄峒峤峋峥崂崃崧崦崮崤崞崆崛嵘崾崴崽嵬嵛嵯嵝嵫嵋嵊嵩嵴嶂嶙嶝豳嶷巅彳彷徂徇徉後徕徙徜徨徭徵徼衢彡犭犰犴犷犸狃狁狎狍狒狨狯狩狲狴狷猁狳猃狺狻猗猓猡猊猞猝猕猢猹猥猬猸猱獐獍獗獠獬獯獾舛夥飧夤夂饣饧饨饩饪饫饬饴饷饽馀馄馇馊馍馐馑馓馔馕庀庑庋庖庥庠庹庵庾庳赓廒廑廛廨廪膺忄忉忖忏怃忮怄忡忤忾怅怆忪忭忸怙怵怦怛怏怍怩怫怊怿怡恸恹恻恺恂恪恽悖悚悭悝悃悒悌悛惬悻悱惝惘惆惚悴愠愦愕愣惴愀愎愫慊慵憬憔憧憷懔懵忝隳闩闫闱闳闵闶闼闾阃阄阆阈阊阋阌阍阏阒阕阖阗阙阚丬爿戕氵汔汜汊沣沅沐沔沌汨汩汴汶沆沩泐泔沭泷泸泱泗沲泠泖泺泫泮沱泓泯泾洹洧洌浃浈洇洄洙洎洫浍洮洵洚浏浒浔洳涑浯涞涠浞涓涔浜浠浼浣渚淇淅淞渎涿淠渑淦淝淙渖涫渌涮渫湮湎湫溲湟溆湓湔渲渥湄滟溱溘滠漭滢溥溧溽溻溷滗溴滏溏滂溟潢潆潇漤漕滹漯漶潋潴漪漉漩澉澍澌潸潲潼潺濑濉澧澹澶濂濡濮濞濠濯瀚瀣瀛瀹瀵灏灞宀宄宕宓宥宸甯骞搴寤寮褰寰蹇謇辶迓迕迥迮迤迩迦迳迨逅逄逋逦逑逍逖逡逵逶逭逯遄遑遒遐遨遘遢遛暹遴遽邂邈邃邋彐彗彖彘尻咫屐屙孱屣屦羼弪弩弭艴弼鬻屮妁妃妍妩妪妣妗姊妫妞妤姒妲妯姗妾娅娆姝娈姣姘姹娌娉娲娴娑娣娓婀婧婊婕娼婢婵胬媪媛婷婺媾嫫媲嫒嫔媸嫠嫣嫱嫖嫦嫘嫜嬉嬗嬖嬲嬷孀尕尜孚孥孳孑孓孢驵驷驸驺驿驽骀骁骅骈骊骐骒骓骖骘骛骜骝骟骠骢骣骥骧纟纡纣纥纨纩纭纰纾绀绁绂绉绋绌绐绔绗绛绠绡绨绫绮绯绱绲缍绶绺绻绾缁缂缃缇缈缋缌缏缑缒缗缙缜缛缟缡缢缣缤缥缦缧缪缫缬缭缯缰缱缲缳缵幺畿巛甾邕玎玑玮玢玟珏珂珑玷玳珀珉珈珥珙顼琊珩珧珞玺珲琏琪瑛琦琥琨琰琮琬琛琚瑁瑜瑗瑕瑙瑷瑭瑾璜璎璀璁璇璋璞璨璩璐璧瓒璺韪韫韬杌杓杞杈杩枥枇杪杳枘枧杵枨枞枭枋杷杼柰栉柘栊柩枰栌柙枵柚枳柝栀柃枸柢栎柁柽栲栳桠桡桎桢桄桤梃栝桕桦桁桧桀栾桊桉栩梵梏桴桷梓桫棂楮棼椟椠棹椤棰椋椁楗棣椐楱椹楠楂楝榄楫榀榘楸椴槌榇榈槎榉楦楣楹榛榧榻榫榭槔榱槁槊槟榕槠榍槿樯槭樗樘橥槲橄樾檠橐橛樵檎橹樽樨橘橼檑檐檩檗檫猷獒殁殂殇殄殒殓殍殚殛殡殪轫轭轱轲轳轵轶轸轷轹轺轼轾辁辂辄辇辋辍辎辏辘辚軎戋戗戛戟戢戡戥戤戬臧瓯瓴瓿甏甑甓攴旮旯旰昊昙杲昃昕昀炅曷昝昴昱昶昵耆晟晔晁晏晖晡晗晷暄暌暧暝暾曛曜曦曩贲贳贶贻贽赀赅赆赈赉赇赍赕赙觇觊觋觌觎觏觐觑牮犟牝牦牯牾牿犄犋犍犏犒挈挲掰搿擘耄毪毳毽毵毹氅氇氆氍氕氘氙氚氡氩氤氪氲攵敕敫牍牒牖爰虢刖肟肜肓肼朊肽肱肫肭肴肷胧胨胩胪胛胂胄胙胍胗朐胝胫胱胴胭脍脎胲胼朕脒豚脶脞脬脘脲腈腌腓腴腙腚腱腠腩腼腽腭腧塍媵膈膂膑滕膣膪臌朦臊膻臁膦欤欷欹歃歆歙飑飒飓飕飙飚殳彀毂觳斐齑斓於旆旄旃旌旎旒旖炀炜炖炝炻烀炷炫炱烨烊焐焓焖焯焱煳煜煨煅煲煊煸煺熘熳熵熨熠燠燔燧燹爝爨灬焘煦熹戾戽扃扈扉礻祀祆祉祛祜祓祚祢祗祠祯祧祺禅禊禚禧禳忑忐怼恝恚恧恁恙恣悫愆愍慝憩憝懋懑戆肀聿沓泶淼矶矸砀砉砗砘砑斫砭砜砝砹砺砻砟砼砥砬砣砩硎硭硖硗砦硐硇硌硪碛碓碚碇碜碡碣碲碹碥磔磙磉磬磲礅磴礓礤礞礴龛黹黻黼盱眄眍盹眇眈眚眢眙眭眦眵眸睐睑睇睃睚睨睢睥睿瞍睽瞀瞌瞑瞟瞠瞰瞵瞽町畀畎畋畈畛畲畹疃罘罡罟詈罨罴罱罹羁罾盍盥蠲钅钆钇钋钊钌钍钏钐钔钗钕钚钛钜钣钤钫钪钭钬钯钰钲钴钶钷钸钹钺钼钽钿铄铈铉铊铋铌铍铎铐铑铒铕铖铗铙铘铛铞铟铠铢铤铥铧铨铪铩铫铮铯铳铴铵铷铹铼铽铿锃锂锆锇锉锊锍锎锏锒锓锔锕锖锘锛锝锞锟锢锪锫锩锬锱锲锴锶锷锸锼锾锿镂锵镄镅镆镉镌镎镏镒镓镔镖镗镘镙镛镞镟镝镡镢镤镥镦镧镨镩镪镫镬镯镱镲镳锺矧矬雉秕秭秣秫稆嵇稃稂稞稔稹稷穑黏馥穰皈皎皓皙皤瓞瓠甬鸠鸢鸨鸩鸪鸫鸬鸲鸱鸶鸸鸷鸹鸺鸾鹁鹂鹄鹆鹇鹈鹉鹋鹌鹎鹑鹕鹗鹚鹛鹜鹞鹣鹦鹧鹨鹩鹪鹫鹬鹱鹭鹳疒疔疖疠疝疬疣疳疴疸痄疱疰痃痂痖痍痣痨痦痤痫痧瘃痱痼痿瘐瘀瘅瘌瘗瘊瘥瘘瘕瘙瘛瘼瘢瘠癀瘭瘰瘿瘵癃瘾瘳癍癞癔癜癖癫癯翊竦穸穹窀窆窈窕窦窠窬窨窭窳衤衩衲衽衿袂袢裆袷袼裉裢裎裣裥裱褚裼裨裾裰褡褙褓褛褊褴褫褶襁襦襻疋胥皲皴矜耒耔耖耜耠耢耥耦耧耩耨耱耋耵聃聆聍聒聩聱覃顸颀颃颉颌颍颏颔颚颛颞颟颡颢颥颦虍虔虬虮虿虺虼虻蚨蚍蚋蚬蚝蚧蚣蚪蚓蚩蚶蛄蚵蛎蚰蚺蚱蚯蛉蛏蚴蛩蛱蛲蛭蛳蛐蜓蛞蛴蛟蛘蛑蜃蜇蛸蜈蜊蜍蜉蜣蜻蜞蜥蜮蜚蜾蝈蜴蜱蜩蜷蜿螂蜢蝽蝾蝻蝠蝰蝌蝮螋蝓蝣蝼蝤蝙蝥螓螯螨蟒蟆螈螅螭螗螃螫蟥螬螵螳蟋蟓螽蟑蟀蟊蟛蟪蟠蟮蠖蠓蟾蠊蠛蠡蠹蠼缶罂罄罅舐竺竽笈笃笄笕笊笫笏筇笸笪笙笮笱笠笥笤笳笾笞筘筚筅筵筌筝筠筮筻筢筲筱箐箦箧箸箬箝箨箅箪箜箢箫箴篑篁篌篝篚篥篦篪簌篾篼簏簖簋簟簪簦簸籁籀臾舁舂舄臬衄舡舢舣舭舯舨舫舸舻舳舴舾艄艉艋艏艚艟艨衾袅袈裘裟襞羝羟羧羯羰羲籼敉粑粝粜粞粢粲粼粽糁糇糌糍糈糅糗糨艮暨羿翎翕翥翡翦翩翮翳糸絷綦綮繇纛麸麴赳趄趔趑趱赧赭豇豉酊酐酎酏酤酢酡酰酩酯酽酾酲酴酹醌醅醐醍醑醢醣醪醭醮醯醵醴醺豕鹾趸跫踅蹙蹩趵趿趼趺跄跖跗跚跞跎跏跛跆跬跷跸跣跹跻跤踉跽踔踝踟踬踮踣踯踺蹀踹踵踽踱蹉蹁蹂蹑蹒蹊蹰蹶蹼蹯蹴躅躏躔躐躜躞豸貂貊貅貘貔斛觖觞觚觜觥觫觯訾謦靓雩雳雯霆霁霈霏霎霪霭霰霾龀龃龅龆龇龈龉龊龌黾鼋鼍隹隼隽雎雒瞿雠銎銮鋈錾鍪鏊鎏鐾鑫鱿鲂鲅鲆鲇鲈稣鲋鲎鲐鲑鲒鲔鲕鲚鲛鲞鲟鲠鲡鲢鲣鲥鲦鲧鲨鲩鲫鲭鲮鲰鲱鲲鲳鲴鲵鲶鲷鲺鲻鲼鲽鳄鳅鳆鳇鳊鳋鳌鳍鳎鳏鳐鳓鳔鳕鳗鳘鳙鳜鳝鳟鳢靼鞅鞑鞒鞔鞯鞫鞣鞲鞴骱骰骷鹘骶骺骼髁髀髅髂髋髌髑魅魃魇魉魈魍魑飨餍餮饕饔髟髡髦髯髫髻髭髹鬈鬏鬓鬟鬣麽麾縻麂麇麈麋麒鏖麝麟黛黜黝黠黟黢黩黧黥黪黯鼢鼬鼯鼹鼷鼽鼾齄"
}
- Version{"35"}
+ Version{"35.1"}
}
pinyin{
Sequence{
@@ -1888,7 +1888,7 @@
"&弞<沈阳/阳"
"&銺<藏文/文"
}
- Version{"35"}
+ Version{"35.1"}
}
private-pinyin{
Sequence{
@@ -1902,7 +1902,7 @@
"&[before 2]u<<ū<<<Ū<<ú<<<Ú<<ǔ<<<Ǔ<<ù<<<Ù"
"&U<<ǖ<<<Ǖ<<ǘ<<<Ǘ<<ǚ<<<Ǚ<<ǜ<<<Ǜ<<ü<<<Ü"
}
- Version{"35"}
+ Version{"35.1"}
}
stroke{
Sequence{
@@ -2604,7 +2604,7 @@
"&龟<<<⻳"
"&龠<<<⿕"
}
- Version{"35"}
+ Version{"35.1"}
}
unihan{
Sequence{
@@ -2612,7 +2612,7 @@
"[import zh-u-co-private-pinyin]"
"[reorder Hani Bopo]"
}
- Version{"35"}
+ Version{"35.1"}
}
zhuyin{
Sequence{
@@ -4638,7 +4638,7 @@
"&龟<<<⻳"
"&龠<<<⿕"
}
- Version{"35"}
+ Version{"35.1"}
}
}
}
diff --git a/source/data/curr/am.txt b/source/data/curr/am.txt
index 756ce5e..e4a991e 100644
--- a/source/data/curr/am.txt
+++ b/source/data/curr/am.txt
@@ -1433,5 +1433,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.18"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ar.txt b/source/data/curr/ar.txt
index 1405cf2..fed53a0 100644
--- a/source/data/curr/ar.txt
+++ b/source/data/curr/ar.txt
@@ -2454,5 +2454,5 @@
two{"{0} {1}"}
zero{"{0} {1}"}
}
- Version{"2.1.48.22"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/az.txt b/source/data/curr/az.txt
index d05d802..855bce1 100644
--- a/source/data/curr/az.txt
+++ b/source/data/curr/az.txt
@@ -2170,5 +2170,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/be.txt b/source/data/curr/be.txt
index d392d5f..158834f 100644
--- a/source/data/curr/be.txt
+++ b/source/data/curr/be.txt
@@ -1643,5 +1643,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/bs.txt b/source/data/curr/bs.txt
index b047378..77ae7fa 100644
--- a/source/data/curr/bs.txt
+++ b/source/data/curr/bs.txt
@@ -2710,5 +2710,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/bs_Cyrl.txt b/source/data/curr/bs_Cyrl.txt
index 825b047..8aa1f4e 100644
--- a/source/data/curr/bs_Cyrl.txt
+++ b/source/data/curr/bs_Cyrl.txt
@@ -2521,5 +2521,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ceb.txt b/source/data/curr/ceb.txt
index 2d93251..3e3f0b9 100644
--- a/source/data/curr/ceb.txt
+++ b/source/data/curr/ceb.txt
@@ -91,5 +91,5 @@
one{"{1} {0}"}
other{"{1} {0}"}
}
- Version{"2.1.49.33"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/chr.txt b/source/data/curr/chr.txt
index cc5b4fb..973ec0a 100644
--- a/source/data/curr/chr.txt
+++ b/source/data/curr/chr.txt
@@ -1289,5 +1289,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/cy.txt b/source/data/curr/cy.txt
index 2bbb6c4..cc5c868 100644
--- a/source/data/curr/cy.txt
+++ b/source/data/curr/cy.txt
@@ -3185,5 +3185,5 @@
two{"{0} {1}"}
zero{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/da.txt b/source/data/curr/da.txt
index 247bc1d..fb26ea4 100644
--- a/source/data/curr/da.txt
+++ b/source/data/curr/da.txt
@@ -2248,5 +2248,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/el.txt b/source/data/curr/el.txt
index 91509ad..99d4bd6 100644
--- a/source/data/curr/el.txt
+++ b/source/data/curr/el.txt
@@ -2266,5 +2266,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.49.26"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/es.txt b/source/data/curr/es.txt
index 2ef0bd7..b5cb9d1 100644
--- a/source/data/curr/es.txt
+++ b/source/data/curr/es.txt
@@ -2227,5 +2227,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/eu.txt b/source/data/curr/eu.txt
index 961ee12..898cfb4 100644
--- a/source/data/curr/eu.txt
+++ b/source/data/curr/eu.txt
@@ -1420,5 +1420,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/fa.txt b/source/data/curr/fa.txt
index 3dd4291..39f4133 100644
--- a/source/data/curr/fa.txt
+++ b/source/data/curr/fa.txt
@@ -1573,5 +1573,5 @@
other{"کواچای زامبیا"}
}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/fil.txt b/source/data/curr/fil.txt
index 623ef7d..96e84d0 100644
--- a/source/data/curr/fil.txt
+++ b/source/data/curr/fil.txt
@@ -1425,5 +1425,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/fr.txt b/source/data/curr/fr.txt
index bd3a7f6..de738d0 100644
--- a/source/data/curr/fr.txt
+++ b/source/data/curr/fr.txt
@@ -2353,5 +2353,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.43"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ga.txt b/source/data/curr/ga.txt
index aae9b96..8a42011 100644
--- a/source/data/curr/ga.txt
+++ b/source/data/curr/ga.txt
@@ -3137,5 +3137,5 @@
other{"{0} {1}"}
two{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/gd.txt b/source/data/curr/gd.txt
index edbb24a..4d72592 100644
--- a/source/data/curr/gd.txt
+++ b/source/data/curr/gd.txt
@@ -3035,5 +3035,5 @@
other{"{0} {1}"}
two{"{0} {1}"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/gl.txt b/source/data/curr/gl.txt
index d64b69e..51b9c51 100644
--- a/source/data/curr/gl.txt
+++ b/source/data/curr/gl.txt
@@ -1598,5 +1598,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/hi.txt b/source/data/curr/hi.txt
index dd57ed5..108dc29 100644
--- a/source/data/curr/hi.txt
+++ b/source/data/curr/hi.txt
@@ -1404,5 +1404,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/hy.txt b/source/data/curr/hy.txt
index db39711..100461b 100644
--- a/source/data/curr/hy.txt
+++ b/source/data/curr/hy.txt
@@ -1338,5 +1338,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/is.txt b/source/data/curr/is.txt
index 0b65916..b70fc2e 100644
--- a/source/data/curr/is.txt
+++ b/source/data/curr/is.txt
@@ -1636,5 +1636,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ja.txt b/source/data/curr/ja.txt
index ed4affa..605ac14 100644
--- a/source/data/curr/ja.txt
+++ b/source/data/curr/ja.txt
@@ -2220,5 +2220,5 @@
CurrencyUnitPatterns{
other{"{0}{1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/kk.txt b/source/data/curr/kk.txt
index 59ac894..c1b3fea 100644
--- a/source/data/curr/kk.txt
+++ b/source/data/curr/kk.txt
@@ -1403,5 +1403,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/km.txt b/source/data/curr/km.txt
index 60beab1..bc4116c 100644
--- a/source/data/curr/km.txt
+++ b/source/data/curr/km.txt
@@ -1242,5 +1242,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ko.txt b/source/data/curr/ko.txt
index 3582d89..4d8a843 100644
--- a/source/data/curr/ko.txt
+++ b/source/data/curr/ko.txt
@@ -1669,5 +1669,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/kok.txt b/source/data/curr/kok.txt
index e4946db..f6f0af1 100644
--- a/source/data/curr/kok.txt
+++ b/source/data/curr/kok.txt
@@ -81,5 +81,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.4"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ky.txt b/source/data/curr/ky.txt
index 8b5ffdb..370a667 100644
--- a/source/data/curr/ky.txt
+++ b/source/data/curr/ky.txt
@@ -1405,5 +1405,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/lb.txt b/source/data/curr/lb.txt
index 456a7f2..5367ede 100644
--- a/source/data/curr/lb.txt
+++ b/source/data/curr/lb.txt
@@ -2249,5 +2249,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/mi.txt b/source/data/curr/mi.txt
index 3f31b43..0d03007 100644
--- a/source/data/curr/mi.txt
+++ b/source/data/curr/mi.txt
@@ -260,5 +260,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/mt.txt b/source/data/curr/mt.txt
index 069c56d..e64c991 100644
--- a/source/data/curr/mt.txt
+++ b/source/data/curr/mt.txt
@@ -1617,5 +1617,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.47.72"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/my.txt b/source/data/curr/my.txt
index 3109815..f0fa661 100644
--- a/source/data/curr/my.txt
+++ b/source/data/curr/my.txt
@@ -1329,5 +1329,5 @@
other{"ဇင်ဘာဘွေ ခွါးချာ"}
}
}
- Version{"2.1.48.36"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ne.txt b/source/data/curr/ne.txt
index 0d51e6b..37112a7 100644
--- a/source/data/curr/ne.txt
+++ b/source/data/curr/ne.txt
@@ -1321,5 +1321,5 @@
other{"जाम्बियाली क्वाचा"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/nl.txt b/source/data/curr/nl.txt
index d4960cf..103fb49 100644
--- a/source/data/curr/nl.txt
+++ b/source/data/curr/nl.txt
@@ -2533,5 +2533,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/nn.txt b/source/data/curr/nn.txt
index 19b3767..ae7c37e 100644
--- a/source/data/curr/nn.txt
+++ b/source/data/curr/nn.txt
@@ -2212,5 +2212,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/or.txt b/source/data/curr/or.txt
index d02cb7e..586a4ad 100644
--- a/source/data/curr/or.txt
+++ b/source/data/curr/or.txt
@@ -1380,5 +1380,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ps.txt b/source/data/curr/ps.txt
index 5811ab4..77d9477 100644
--- a/source/data/curr/ps.txt
+++ b/source/data/curr/ps.txt
@@ -37,5 +37,5 @@
other{"(نامعلومه مروجه پېسې)"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/pt_PT.txt b/source/data/curr/pt_PT.txt
index 7053078..8b6759a 100644
--- a/source/data/curr/pt_PT.txt
+++ b/source/data/curr/pt_PT.txt
@@ -1199,5 +1199,5 @@
other{"Kwachas zambianos (1968–2012)"}
}
}
- Version{"2.1.47.89"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/qu.txt b/source/data/curr/qu.txt
index 8fe3371..517f0d4 100644
--- a/source/data/curr/qu.txt
+++ b/source/data/curr/qu.txt
@@ -10,5 +10,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ro.txt b/source/data/curr/ro.txt
index 7135ce9..54dca20 100644
--- a/source/data/curr/ro.txt
+++ b/source/data/curr/ro.txt
@@ -2130,5 +2130,5 @@
one{"{0} {1}"}
other{"{0} de {1}"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/root.txt b/source/data/curr/root.txt
index e1f768c..2e1eaaf 100644
--- a/source/data/curr/root.txt
+++ b/source/data/curr/root.txt
@@ -196,7 +196,7 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
currencySpacing{
afterCurrency{
currencyMatch{"[:^S:]"}
diff --git a/source/data/curr/ru.txt b/source/data/curr/ru.txt
index 8ace567..6e808ae 100644
--- a/source/data/curr/ru.txt
+++ b/source/data/curr/ru.txt
@@ -2235,5 +2235,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/rw.txt b/source/data/curr/rw.txt
index 7fa3a36..7a77e5d 100644
--- a/source/data/curr/rw.txt
+++ b/source/data/curr/rw.txt
@@ -10,5 +10,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/sd.txt b/source/data/curr/sd.txt
index b1857e8..5d613a8 100644
--- a/source/data/curr/sd.txt
+++ b/source/data/curr/sd.txt
@@ -1285,5 +1285,5 @@
other{"زمبائي ڪواچا"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/so.txt b/source/data/curr/so.txt
index a5d29e1..4946607 100644
--- a/source/data/curr/so.txt
+++ b/source/data/curr/so.txt
@@ -1368,5 +1368,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/sr.txt b/source/data/curr/sr.txt
index 58bfab9..ef2ea8d 100644
--- a/source/data/curr/sr.txt
+++ b/source/data/curr/sr.txt
@@ -2656,5 +2656,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/sr_Latn.txt b/source/data/curr/sr_Latn.txt
index b6c6236..ff831fd 100644
--- a/source/data/curr/sr_Latn.txt
+++ b/source/data/curr/sr_Latn.txt
@@ -2657,5 +2657,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.77"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/tg.txt b/source/data/curr/tg.txt
index 58ae0dc..faaf7cf 100644
--- a/source/data/curr/tg.txt
+++ b/source/data/curr/tg.txt
@@ -88,5 +88,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.47.96"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/th.txt b/source/data/curr/th.txt
index 3e50e9c..d28d01a 100644
--- a/source/data/curr/th.txt
+++ b/source/data/curr/th.txt
@@ -1762,5 +1762,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ti.txt b/source/data/curr/ti.txt
index bd1887a..d7b59c1 100644
--- a/source/data/curr/ti.txt
+++ b/source/data/curr/ti.txt
@@ -43,5 +43,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/tk.txt b/source/data/curr/tk.txt
index 4eaf940..7922db9 100644
--- a/source/data/curr/tk.txt
+++ b/source/data/curr/tk.txt
@@ -1388,5 +1388,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/tt.txt b/source/data/curr/tt.txt
index 5de9045..0682a01 100644
--- a/source/data/curr/tt.txt
+++ b/source/data/curr/tt.txt
@@ -81,5 +81,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ug.txt b/source/data/curr/ug.txt
index 08dc3c8..cd5f3ff 100644
--- a/source/data/curr/ug.txt
+++ b/source/data/curr/ug.txt
@@ -2417,5 +2417,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/uk.txt b/source/data/curr/uk.txt
index 850311d..c666873 100644
--- a/source/data/curr/uk.txt
+++ b/source/data/curr/uk.txt
@@ -2219,5 +2219,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/ur.txt b/source/data/curr/ur.txt
index ac6e38e..fdf544a 100644
--- a/source/data/curr/ur.txt
+++ b/source/data/curr/ur.txt
@@ -1430,5 +1430,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/uz.txt b/source/data/curr/uz.txt
index 383fd06..0edd69c 100644
--- a/source/data/curr/uz.txt
+++ b/source/data/curr/uz.txt
@@ -1311,5 +1311,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/uz_Cyrl.txt b/source/data/curr/uz_Cyrl.txt
index 4790d2e..51ab107 100644
--- a/source/data/curr/uz_Cyrl.txt
+++ b/source/data/curr/uz_Cyrl.txt
@@ -422,5 +422,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/vi.txt b/source/data/curr/vi.txt
index 0d7c3ca..eb8dc2a 100644
--- a/source/data/curr/vi.txt
+++ b/source/data/curr/vi.txt
@@ -1739,5 +1739,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/wo.txt b/source/data/curr/wo.txt
index 9ed1811..42d1fce 100644
--- a/source/data/curr/wo.txt
+++ b/source/data/curr/wo.txt
@@ -88,5 +88,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.47.84"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/xh.txt b/source/data/curr/xh.txt
index 71f73c2..d8f9c92 100644
--- a/source/data/curr/xh.txt
+++ b/source/data/curr/xh.txt
@@ -20,5 +20,5 @@
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.1.48.89"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/yue.txt b/source/data/curr/yue.txt
index 6421d57..cbefee9 100644
--- a/source/data/curr/yue.txt
+++ b/source/data/curr/yue.txt
@@ -2128,5 +2128,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/yue_Hans.txt b/source/data/curr/yue_Hans.txt
index f6d3a76..0312ca6 100644
--- a/source/data/curr/yue_Hans.txt
+++ b/source/data/curr/yue_Hans.txt
@@ -2129,5 +2129,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.80"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/zh.txt b/source/data/curr/zh.txt
index 86646a1..9a126aa 100644
--- a/source/data/curr/zh.txt
+++ b/source/data/curr/zh.txt
@@ -2167,5 +2167,5 @@
CurrencyUnitPatterns{
other{"{0}{1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/curr/zh_Hant.txt b/source/data/curr/zh_Hant.txt
index 6721589..d914b74 100644
--- a/source/data/curr/zh_Hant.txt
+++ b/source/data/curr/zh_Hant.txt
@@ -2220,5 +2220,5 @@
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/in/coll/ucadata-implicithan.icu b/source/data/in/coll/ucadata-implicithan.icu
index 05ad0b1..296515d 100644
--- a/source/data/in/coll/ucadata-implicithan.icu
+++ b/source/data/in/coll/ucadata-implicithan.icu
Binary files differ
diff --git a/source/data/in/coll/ucadata-unihan.icu b/source/data/in/coll/ucadata-unihan.icu
index c67bc5c..3c86fd1 100644
--- a/source/data/in/coll/ucadata-unihan.icu
+++ b/source/data/in/coll/ucadata-unihan.icu
Binary files differ
diff --git a/source/data/in/nfc.nrm b/source/data/in/nfc.nrm
index d13f4d3..5691b2b 100644
--- a/source/data/in/nfc.nrm
+++ b/source/data/in/nfc.nrm
Binary files differ
diff --git a/source/data/in/nfkc.nrm b/source/data/in/nfkc.nrm
index 3159f19..b0f4405 100644
--- a/source/data/in/nfkc.nrm
+++ b/source/data/in/nfkc.nrm
Binary files differ
diff --git a/source/data/in/nfkc_cf.nrm b/source/data/in/nfkc_cf.nrm
index 1cc63aa..eef4e62 100644
--- a/source/data/in/nfkc_cf.nrm
+++ b/source/data/in/nfkc_cf.nrm
Binary files differ
diff --git a/source/data/in/pnames.icu b/source/data/in/pnames.icu
index bcdf576..443a8e4 100644
--- a/source/data/in/pnames.icu
+++ b/source/data/in/pnames.icu
Binary files differ
diff --git a/source/data/in/ubidi.icu b/source/data/in/ubidi.icu
index bf4df7e..df3bbb8 100644
--- a/source/data/in/ubidi.icu
+++ b/source/data/in/ubidi.icu
Binary files differ
diff --git a/source/data/in/ucase.icu b/source/data/in/ucase.icu
index c7c33e7..cb65fe7 100644
--- a/source/data/in/ucase.icu
+++ b/source/data/in/ucase.icu
Binary files differ
diff --git a/source/data/in/ulayout.icu b/source/data/in/ulayout.icu
index 7ec7a51..c129d1b 100644
--- a/source/data/in/ulayout.icu
+++ b/source/data/in/ulayout.icu
Binary files differ
diff --git a/source/data/in/unames.icu b/source/data/in/unames.icu
index e8ffe8e..77ff1fd 100644
--- a/source/data/in/unames.icu
+++ b/source/data/in/unames.icu
Binary files differ
diff --git a/source/data/in/uprops.icu b/source/data/in/uprops.icu
index d24261c..4a16695 100644
--- a/source/data/in/uprops.icu
+++ b/source/data/in/uprops.icu
Binary files differ
diff --git a/source/data/in/uts46.nrm b/source/data/in/uts46.nrm
index d281563..210b4d6 100644
--- a/source/data/in/uts46.nrm
+++ b/source/data/in/uts46.nrm
Binary files differ
diff --git a/source/data/lang/am.txt b/source/data/lang/am.txt
index 118af62..097a011 100644
--- a/source/data/lang/am.txt
+++ b/source/data/lang/am.txt
@@ -688,7 +688,7 @@
vaii{"የቫይ አሃዞች"}
}
}
- Version{"2.1.48.18"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — ሁሉም"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/ar.txt b/source/data/lang/ar.txt
index 853f641..c57a87e 100644
--- a/source/data/lang/ar.txt
+++ b/source/data/lang/ar.txt
@@ -852,7 +852,7 @@
VALENCIA{"بلنسية"}
WADEGILE{"المندرين باللاتينية - ويد–جيلز"}
}
- Version{"2.1.48.22"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} - الكل"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/az.txt b/source/data/lang/az.txt
index 03d88e3..108596e 100644
--- a/source/data/lang/az.txt
+++ b/source/data/lang/az.txt
@@ -746,7 +746,7 @@
tibt{"Tibet Rəqəmləri"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — Bütün"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/be.txt b/source/data/lang/be.txt
index f018f15..2ac17da 100644
--- a/source/data/lang/be.txt
+++ b/source/data/lang/be.txt
@@ -551,7 +551,7 @@
tibt{"тыбецкія лічбы"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — Усё"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/bs.txt b/source/data/lang/bs.txt
index 31e4bd2..c77a4bc 100644
--- a/source/data/lang/bs.txt
+++ b/source/data/lang/bs.txt
@@ -796,7 +796,7 @@
TARASK{"Taraskijevica ortografija"}
VALENCIA{"Valencijski"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — sve"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/bs_Cyrl.txt b/source/data/lang/bs_Cyrl.txt
index 5c93d70..5f34951 100644
--- a/source/data/lang/bs_Cyrl.txt
+++ b/source/data/lang/bs_Cyrl.txt
@@ -696,7 +696,7 @@
TARASK{"Тараскијевичка ортографија"}
VALENCIA{"Валенцијска"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — све"}
strokes{
diff --git a/source/data/lang/ceb.txt b/source/data/lang/ceb.txt
index 2442c1e..c866d52 100644
--- a/source/data/lang/ceb.txt
+++ b/source/data/lang/ceb.txt
@@ -57,7 +57,7 @@
latn{"Kasadpanhong mga Digit"}
}
}
- Version{"2.1.49.33"}
+ Version{"2.1.49.82"}
codePatterns{
language{"Pinulongan: {0}"}
script{"Alpabeto {0}"}
diff --git a/source/data/lang/chr.txt b/source/data/lang/chr.txt
index c3bbd24..f1640b5 100644
--- a/source/data/lang/chr.txt
+++ b/source/data/lang/chr.txt
@@ -540,7 +540,7 @@
tibt{"ᏘᏇᏔᏂ ᏗᏎᏍᏗ"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — ᏂᎦᏓ"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/cy.txt b/source/data/lang/cy.txt
index b9ac671..85ecd5d 100644
--- a/source/data/lang/cy.txt
+++ b/source/data/lang/cy.txt
@@ -733,7 +733,7 @@
VAIDIKA{"VAIDIKA"}
VALLADER{"VALLADER"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — y cwbl"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/da.txt b/source/data/lang/da.txt
index 8a4d18c..9d85978 100644
--- a/source/data/lang/da.txt
+++ b/source/data/lang/da.txt
@@ -962,7 +962,7 @@
VALLADER{"vallader"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} – alle"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/el.txt b/source/data/lang/el.txt
index f44554b..3192ba1 100644
--- a/source/data/lang/el.txt
+++ b/source/data/lang/el.txt
@@ -883,7 +883,7 @@
VALENCIA{"Βαλενθιανά"}
WADEGILE{"Εκλατινισμένα Γουάντ-Γκιλς"}
}
- Version{"2.1.49.26"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — όλα"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/es.txt b/source/data/lang/es.txt
index 000771a..87ac538 100644
--- a/source/data/lang/es.txt
+++ b/source/data/lang/es.txt
@@ -851,7 +851,7 @@
VALENCIA{"Valenciano"}
WADEGILE{"Romanización Wade-Giles"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — Todo"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/eu.txt b/source/data/lang/eu.txt
index 5643bf8..d97d26f 100644
--- a/source/data/lang/eu.txt
+++ b/source/data/lang/eu.txt
@@ -625,7 +625,7 @@
SCOTLAND{"ESKOZIAR INGELESA"}
VALENCIA{"VALENTZIERA"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — Guztiak"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/fa.txt b/source/data/lang/fa.txt
index 10b705c..64d192c 100644
--- a/source/data/lang/fa.txt
+++ b/source/data/lang/fa.txt
@@ -856,7 +856,7 @@
SAAHO{"ساهویی"}
SCOTLAND{"انگلیسی معیار اسکاتلند"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — همه"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/fil.txt b/source/data/lang/fil.txt
index 2c198cc..fc53a80 100644
--- a/source/data/lang/fil.txt
+++ b/source/data/lang/fil.txt
@@ -665,7 +665,7 @@
PINYIN{"Pinyin Romanization"}
WADEGILE{"Wade-Giles Romanization"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — lahat"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/fr.txt b/source/data/lang/fr.txt
index 0d3f05b..0e03487 100644
--- a/source/data/lang/fr.txt
+++ b/source/data/lang/fr.txt
@@ -977,7 +977,7 @@
VALENCIA{"valencien"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.1.48.43"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — tout"}
category-list{"{0} : {1}"}
diff --git a/source/data/lang/ga.txt b/source/data/lang/ga.txt
index c508dfc..8ad1418 100644
--- a/source/data/lang/ga.txt
+++ b/source/data/lang/ga.txt
@@ -854,7 +854,7 @@
WADEGILE{"Rómhánú Wade-Giles"}
XSISTEMO{"XSISTEMO"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — Uile"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/gd.txt b/source/data/lang/gd.txt
index d006da5..aa7d6ab 100644
--- a/source/data/lang/gd.txt
+++ b/source/data/lang/gd.txt
@@ -1032,7 +1032,7 @@
WADEGILE{"Ròmanachadh Wade-Giles"}
XSISTEMO{"XSISTEMO"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} – na h-uile"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/gl.txt b/source/data/lang/gl.txt
index f18f06b..720342b 100644
--- a/source/data/lang/gl.txt
+++ b/source/data/lang/gl.txt
@@ -626,7 +626,7 @@
vaii{"Díxitos Vai"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} (todo)"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/hi.txt b/source/data/lang/hi.txt
index 6d459cb..6507ce3 100644
--- a/source/data/lang/hi.txt
+++ b/source/data/lang/hi.txt
@@ -840,7 +840,7 @@
POSIX{"कम्प्यूटर"}
REVISED{"संशोधित वर्तनी"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — सभी"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/hy.txt b/source/data/lang/hy.txt
index b667e32..563b23a 100644
--- a/source/data/lang/hy.txt
+++ b/source/data/lang/hy.txt
@@ -620,7 +620,7 @@
AREVELA{"արևելահայերեն"}
AREVMDA{"արեւմտահայերէն"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — բոլորը"}
category-list{"{0}՝ {1}"}
diff --git a/source/data/lang/is.txt b/source/data/lang/is.txt
index f4c7d21..4d2d0c2 100644
--- a/source/data/lang/is.txt
+++ b/source/data/lang/is.txt
@@ -751,7 +751,7 @@
vaii{"Vai-tölustafir"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — allt"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/ja.txt b/source/data/lang/ja.txt
index 334eaa6..3b9a9b7 100644
--- a/source/data/lang/ja.txt
+++ b/source/data/lang/ja.txt
@@ -1045,7 +1045,7 @@
VALLADER{"ヴァラダー"}
WADEGILE{"ウェード式ローマ字表記法"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — すべて"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/kk.txt b/source/data/lang/kk.txt
index 5d4b44b..9d414dc 100644
--- a/source/data/lang/kk.txt
+++ b/source/data/lang/kk.txt
@@ -546,7 +546,7 @@
tibt{"Тибет сандары"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — барлығы"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/km.txt b/source/data/lang/km.txt
index ae15b7b..077f05b 100644
--- a/source/data/lang/km.txt
+++ b/source/data/lang/km.txt
@@ -535,7 +535,7 @@
tibt{"លេខទីបេ"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — ទាំងអស់"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/ko.txt b/source/data/lang/ko.txt
index 0751229..7e6d6c4 100644
--- a/source/data/lang/ko.txt
+++ b/source/data/lang/ko.txt
@@ -922,7 +922,7 @@
VAIDIKA{"바이디카"}
VALLADER{"발라더"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — 전체"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/kok.txt b/source/data/lang/kok.txt
index 35b1eea..5862e6b 100644
--- a/source/data/lang/kok.txt
+++ b/source/data/lang/kok.txt
@@ -544,7 +544,7 @@
tibt{"तिबेतियन"}
}
}
- Version{"2.1.48.4"}
+ Version{"2.1.49.82"}
codePatterns{
language{"भाशा: {0}"}
script{"लिपी: {0}"}
diff --git a/source/data/lang/ky.txt b/source/data/lang/ky.txt
index 983a1cc..10da8f7 100644
--- a/source/data/lang/ky.txt
+++ b/source/data/lang/ky.txt
@@ -540,7 +540,7 @@
tibt{"Тибет сандары"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — баары"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/lb.txt b/source/data/lang/lb.txt
index 32376f5..72610de 100644
--- a/source/data/lang/lb.txt
+++ b/source/data/lang/lb.txt
@@ -875,7 +875,7 @@
VALENCIA{"Valencianesch"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
codePatterns{
language{"Sprooch: {0}"}
script{"Schrëft: {0}"}
diff --git a/source/data/lang/mi.txt b/source/data/lang/mi.txt
index b26b62e..0afe831 100644
--- a/source/data/lang/mi.txt
+++ b/source/data/lang/mi.txt
@@ -57,7 +57,7 @@
latn{"Ngā Mati Pākehā"}
}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/source/data/lang/mt.txt b/source/data/lang/mt.txt
index 098a22d..a21da76 100644
--- a/source/data/lang/mt.txt
+++ b/source/data/lang/mt.txt
@@ -559,7 +559,7 @@
Variants{
REVISED{"Ortografija Irriveda"}
}
- Version{"2.1.47.72"}
+ Version{"2.1.49.82"}
codePatterns{
language{"Lingwa: {0}"}
script{"Skript: {0}"}
diff --git a/source/data/lang/my.txt b/source/data/lang/my.txt
index f67393a..41f473d 100644
--- a/source/data/lang/my.txt
+++ b/source/data/lang/my.txt
@@ -580,7 +580,7 @@
REVISED{"ပြန်လည်စီစစ်ထားသော ရေးထုံး"}
SCOTLAND{"စကော့ စံ အင်္ဂလိပ်"}
}
- Version{"2.1.48.36"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — အားလုံး"}
category-list{"{0} − {1}"}
diff --git a/source/data/lang/ne.txt b/source/data/lang/ne.txt
index ce2a612..d8c3362 100644
--- a/source/data/lang/ne.txt
+++ b/source/data/lang/ne.txt
@@ -798,7 +798,7 @@
AREVELA{"पूर्वी आर्मेनियाली"}
POSIX{"कम्प्युटर"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0}-सबै"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/nl.txt b/source/data/lang/nl.txt
index 2e7bb82..5552588 100644
--- a/source/data/lang/nl.txt
+++ b/source/data/lang/nl.txt
@@ -1114,7 +1114,7 @@
WADEGILE{"Wade-Giles-romanisering"}
XSISTEMO{"X-sistemo"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — alle"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/nn.txt b/source/data/lang/nn.txt
index 481f840..6aade66 100644
--- a/source/data/lang/nn.txt
+++ b/source/data/lang/nn.txt
@@ -761,7 +761,7 @@
TARASK{"taraskievica-ortografi"}
VALENCIA{"valensisk dialekt"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} – alt"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/or.txt b/source/data/lang/or.txt
index 411b859..998ab33 100644
--- a/source/data/lang/or.txt
+++ b/source/data/lang/or.txt
@@ -739,7 +739,7 @@
tibt{"ତିବତୀ ଅଙ୍କଗୁଡ଼ିକ"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — ସମସ୍ତ"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/ps.txt b/source/data/lang/ps.txt
index 9b48da2..95cb4e4 100644
--- a/source/data/lang/ps.txt
+++ b/source/data/lang/ps.txt
@@ -486,7 +486,7 @@
latn{"لويديځ عددونه"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} - ټول"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/pt_PT.txt b/source/data/lang/pt_PT.txt
index 278a538..0035f10 100644
--- a/source/data/lang/pt_PT.txt
+++ b/source/data/lang/pt_PT.txt
@@ -257,7 +257,7 @@
MONOTON{"monotónico"}
POLYTON{"politónico"}
}
- Version{"2.1.47.89"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} – tudo"}
compatibility{"{0} – compatibilidade"}
diff --git a/source/data/lang/qu.txt b/source/data/lang/qu.txt
index b7c4e78..cd2698c 100644
--- a/source/data/lang/qu.txt
+++ b/source/data/lang/qu.txt
@@ -141,5 +141,5 @@
Variants{
VALENCIA{"Valenciano Simi"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/lang/ro.txt b/source/data/lang/ro.txt
index 757f79d..a04de62 100644
--- a/source/data/lang/ro.txt
+++ b/source/data/lang/ro.txt
@@ -781,7 +781,7 @@
SCOTLAND{"engleză standard scoțiană"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} – toate"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/root.txt b/source/data/lang/root.txt
index c68b70e..bb0bdcb 100644
--- a/source/data/lang/root.txt
+++ b/source/data/lang/root.txt
@@ -4,7 +4,7 @@
* ICU <specials> source: <path>/common/main/root.xml
*/
root{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — all"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/ru.txt b/source/data/lang/ru.txt
index 6fcef1d..c37fd98 100644
--- a/source/data/lang/ru.txt
+++ b/source/data/lang/ru.txt
@@ -918,7 +918,7 @@
VALENCIA{"Валенсийский"}
WADEGILE{"Система Уэйда – Джайлза"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — все"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/rw.txt b/source/data/lang/rw.txt
index e34e056..a02a8f0 100644
--- a/source/data/lang/rw.txt
+++ b/source/data/lang/rw.txt
@@ -108,5 +108,5 @@
yi{"Inyeyidishi"}
zu{"Inyezulu"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/lang/sd.txt b/source/data/lang/sd.txt
index d2d2e93..3615c88 100644
--- a/source/data/lang/sd.txt
+++ b/source/data/lang/sd.txt
@@ -536,7 +536,7 @@
tibt{"تبتي عدد"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — سڀئي"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/so.txt b/source/data/lang/so.txt
index 28f5d8e..286825b 100644
--- a/source/data/lang/so.txt
+++ b/source/data/lang/so.txt
@@ -379,7 +379,7 @@
tibt{"Godka Tirada Tibetan"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} dhamaan"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/sr.txt b/source/data/lang/sr.txt
index 0bfcd1c..361baf0 100644
--- a/source/data/lang/sr.txt
+++ b/source/data/lang/sr.txt
@@ -849,7 +849,7 @@
TARASK{"Тараскијевичка ортографија"}
VALENCIA{"Валенцијска"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — све"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/sr_Latn.txt b/source/data/lang/sr_Latn.txt
index 0b42dc7..d9bc6c6 100644
--- a/source/data/lang/sr_Latn.txt
+++ b/source/data/lang/sr_Latn.txt
@@ -850,7 +850,7 @@
TARASK{"Taraskijevička ortografija"}
VALENCIA{"Valencijska"}
}
- Version{"2.1.48.77"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — sve"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/th.txt b/source/data/lang/th.txt
index 8185244..41bcdb4 100644
--- a/source/data/lang/th.txt
+++ b/source/data/lang/th.txt
@@ -1055,7 +1055,7 @@
VALLADER{"วัลลาเดอร์"}
WADEGILE{"การถอดอักษรแบบเวด-ไจลส์"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — ทั้งหมด"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/ti.txt b/source/data/lang/ti.txt
index 89c343d..0b303ca 100644
--- a/source/data/lang/ti.txt
+++ b/source/data/lang/ti.txt
@@ -104,7 +104,7 @@
Ethi{"ፊደል"}
Latn{"ላቲን"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/source/data/lang/tk.txt b/source/data/lang/tk.txt
index 1522ff0..ca74d2a 100644
--- a/source/data/lang/tk.txt
+++ b/source/data/lang/tk.txt
@@ -527,7 +527,7 @@
tibt{"Tibet sanlary"}
}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — ähli"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/tt.txt b/source/data/lang/tt.txt
index 9a01277..e4a67e8 100644
--- a/source/data/lang/tt.txt
+++ b/source/data/lang/tt.txt
@@ -177,7 +177,7 @@
latn{"көнбатыш цифрлары"}
}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
codePatterns{
language{"Тел: {0}"}
script{"Язу: {0}"}
diff --git a/source/data/lang/ug.txt b/source/data/lang/ug.txt
index b219bc2..643c945 100644
--- a/source/data/lang/ug.txt
+++ b/source/data/lang/ug.txt
@@ -830,7 +830,7 @@
VALENCIA{"ۋالېنسىيە"}
WADEGILE{"ۋېي ئائىلىسى پىنيىن لاتىنلاشتۇرۇش"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
codePatterns{
language{"تىل: {0}"}
script{"يېزىق: {0}"}
diff --git a/source/data/lang/uk.txt b/source/data/lang/uk.txt
index 6dc01e5..94110c3 100644
--- a/source/data/lang/uk.txt
+++ b/source/data/lang/uk.txt
@@ -902,7 +902,7 @@
VALENCIA{"Валенсійська"}
WADEGILE{"Романізація Вейда-Джайлза"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — усі"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/ur.txt b/source/data/lang/ur.txt
index 0e1116d..43e2c04 100644
--- a/source/data/lang/ur.txt
+++ b/source/data/lang/ur.txt
@@ -633,7 +633,7 @@
vaii{"وائی ہندسے"}
}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — تمام"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/uz.txt b/source/data/lang/uz.txt
index 993a6cf..5ccf055 100644
--- a/source/data/lang/uz.txt
+++ b/source/data/lang/uz.txt
@@ -546,7 +546,7 @@
tibt{"tibet raqamlari"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — hammasi"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/uz_Cyrl.txt b/source/data/lang/uz_Cyrl.txt
index 887de86..88e4465 100644
--- a/source/data/lang/uz_Cyrl.txt
+++ b/source/data/lang/uz_Cyrl.txt
@@ -407,7 +407,7 @@
tibt{"Тибет рақамлари"}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
codePatterns{
language{"Тил: {0}"}
script{"{0}"}
diff --git a/source/data/lang/vi.txt b/source/data/lang/vi.txt
index c3841d6..b21a0ad 100644
--- a/source/data/lang/vi.txt
+++ b/source/data/lang/vi.txt
@@ -1055,7 +1055,7 @@
WADEGILE{"La Mã hóa Wade-Giles"}
XSISTEMO{"XSISTEMO"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — tất cả"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/wo.txt b/source/data/lang/wo.txt
index 59b948f..6dd986f 100644
--- a/source/data/lang/wo.txt
+++ b/source/data/lang/wo.txt
@@ -181,7 +181,7 @@
latn{"Siifari Tugal"}
}
}
- Version{"2.1.47.84"}
+ Version{"2.1.49.82"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/source/data/lang/xh.txt b/source/data/lang/xh.txt
index 27c6c75..c88970c 100644
--- a/source/data/lang/xh.txt
+++ b/source/data/lang/xh.txt
@@ -4,5 +4,5 @@
Languages{
xh{"isiXhosa"}
}
- Version{"2.1.48.89"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/lang/yue.txt b/source/data/lang/yue.txt
index bdc130f..d21f7b2 100644
--- a/source/data/lang/yue.txt
+++ b/source/data/lang/yue.txt
@@ -1025,7 +1025,7 @@
VALLADER{"瑞士瓦勒德方言"}
WADEGILE{"威妥瑪式拼音"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — 全部"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/yue_Hans.txt b/source/data/lang/yue_Hans.txt
index ac5b6a9..13a54b4 100644
--- a/source/data/lang/yue_Hans.txt
+++ b/source/data/lang/yue_Hans.txt
@@ -1026,7 +1026,7 @@
VALLADER{"瑞士瓦勒德方言"}
WADEGILE{"威妥玛式拼音"}
}
- Version{"2.1.48.80"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — 全部"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/zh.txt b/source/data/lang/zh.txt
index c9d89ee..c9c56b9 100644
--- a/source/data/lang/zh.txt
+++ b/source/data/lang/zh.txt
@@ -1022,7 +1022,7 @@
VALLADER{"瑞士瓦勒德方言"}
WADEGILE{"WG 威氏拼音法"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — 全部"}
category-list{"{0}: {1}"}
diff --git a/source/data/lang/zh_Hant.txt b/source/data/lang/zh_Hant.txt
index d1d5aed..e5488b3 100644
--- a/source/data/lang/zh_Hant.txt
+++ b/source/data/lang/zh_Hant.txt
@@ -1075,7 +1075,7 @@
VALLADER{"瑞士瓦勒德方言"}
WADEGILE{"威妥瑪式拼音"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
characterLabelPattern{
all{"{0} — 全部"}
category-list{"{0}: {1}"}
diff --git a/source/data/locales/am.txt b/source/data/locales/am.txt
index 198da77..5b23232 100644
--- a/source/data/locales/am.txt
+++ b/source/data/locales/am.txt
@@ -216,7 +216,7 @@
minimumGroupingDigits{"1"}
traditional{"ethi"}
}
- Version{"2.1.48.18"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/ar.txt b/source/data/locales/ar.txt
index 671933e..4676209 100644
--- a/source/data/locales/ar.txt
+++ b/source/data/locales/ar.txt
@@ -376,7 +376,7 @@
minimumGroupingDigits{"1"}
native{"arab"}
}
- Version{"2.1.48.22"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
@@ -1736,7 +1736,7 @@
"تيشو",
"شووا",
"هيسي",
- "Qqqq",
+ "ريوا",
}
}
}
diff --git a/source/data/locales/ast.txt b/source/data/locales/ast.txt
index 4bc974a..4f3fa99 100644
--- a/source/data/locales/ast.txt
+++ b/source/data/locales/ast.txt
@@ -2304,7 +2304,7 @@
"Taishō",
"e. Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
narrow{
"Taika",
@@ -2543,7 +2543,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
wide{
"Taika (645–650)",
@@ -2782,7 +2782,7 @@
"Taishō",
"era Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
intervalFormats{
diff --git a/source/data/locales/az.txt b/source/data/locales/az.txt
index d1bfa07..83d6aaf 100644
--- a/source/data/locales/az.txt
+++ b/source/data/locales/az.txt
@@ -213,7 +213,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/be.txt b/source/data/locales/be.txt
index e66e2ca..bf80d86 100644
--- a/source/data/locales/be.txt
+++ b/source/data/locales/be.txt
@@ -287,7 +287,7 @@
}
minimumGroupingDigits{"2"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/br.txt b/source/data/locales/br.txt
index 2cc1f7a..902b994 100644
--- a/source/data/locales/br.txt
+++ b/source/data/locales/br.txt
@@ -3900,7 +3900,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
narrow{
"Taika (645–650)",
@@ -4139,7 +4139,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
wide{
"Taika (645–650)",
@@ -4378,7 +4378,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
intervalFormats{
diff --git a/source/data/locales/bs.txt b/source/data/locales/bs.txt
index a3b0c23..126f12c 100644
--- a/source/data/locales/bs.txt
+++ b/source/data/locales/bs.txt
@@ -243,7 +243,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/bs_Cyrl.txt b/source/data/locales/bs_Cyrl.txt
index a0057e4..3c83462 100644
--- a/source/data/locales/bs_Cyrl.txt
+++ b/source/data/locales/bs_Cyrl.txt
@@ -166,7 +166,7 @@
}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
@@ -1035,7 +1035,7 @@
"Таишо",
"Шова",
"Хаисеи",
- "Qqqq",
+ "Реива",
}
}
}
diff --git a/source/data/locales/ceb.txt b/source/data/locales/ceb.txt
index a47feac..d7aa419 100644
--- a/source/data/locales/ceb.txt
+++ b/source/data/locales/ceb.txt
@@ -22,7 +22,7 @@
}
}
}
- Version{"2.1.49.33"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/chr.txt b/source/data/locales/chr.txt
index 1c627bf..61f1331 100644
--- a/source/data/locales/chr.txt
+++ b/source/data/locales/chr.txt
@@ -215,7 +215,7 @@
}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/cs.txt b/source/data/locales/cs.txt
index dc51d32..754cb44 100644
--- a/source/data/locales/cs.txt
+++ b/source/data/locales/cs.txt
@@ -2671,7 +2671,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
narrow{
"Taika (645–650)",
@@ -2910,7 +2910,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
wide{
"Taika (645–650)",
@@ -3149,7 +3149,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
intervalFormats{
diff --git a/source/data/locales/cy.txt b/source/data/locales/cy.txt
index 0134499..4fd29b6 100644
--- a/source/data/locales/cy.txt
+++ b/source/data/locales/cy.txt
@@ -388,7 +388,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/da.txt b/source/data/locales/da.txt
index be1c703..0be3af3 100644
--- a/source/data/locales/da.txt
+++ b/source/data/locales/da.txt
@@ -209,7 +209,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
coptic{
eras{
diff --git a/source/data/locales/el.txt b/source/data/locales/el.txt
index e721218..e2ba7a3 100644
--- a/source/data/locales/el.txt
+++ b/source/data/locales/el.txt
@@ -211,7 +211,7 @@
minimumGroupingDigits{"1"}
traditional{"grek"}
}
- Version{"2.1.49.26"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -1230,6 +1230,247 @@
yMd{"dd/MM/y GGGGG"}
yQQQ{"y GGGGG QQQ"}
}
+ eras{
+ abbreviated{
+ "Taika (645–650)",
+ "Hakuchi (650–671)",
+ "Hakuhō (672–686)",
+ "Shuchō (686–701)",
+ "Taihō (701–704)",
+ "Keiun (704–708)",
+ "Wadō (708–715)",
+ "Reiki (715–717)",
+ "Yōrō (717–724)",
+ "Jinki (724–729)",
+ "Tenpyō (729–749)",
+ "Tenpyō-kampō (749–749)",
+ "Tenpyō-shōhō (749–757)",
+ "Tenpyō-hōji (757–765)",
+ "Tenpyō-jingo (765–767)",
+ "Jingo-keiun (767–770)",
+ "Hōki (770–780)",
+ "Ten-ō (781–782)",
+ "Enryaku (782–806)",
+ "Daidō (806–810)",
+ "Kōnin (810–824)",
+ "Tenchō (824–834)",
+ "Jōwa (834–848)",
+ "Kajō (848–851)",
+ "Ninju (851–854)",
+ "Saikō (854–857)",
+ "Ten-an (857–859)",
+ "Jōgan (859–877)",
+ "Gangyō (877–885)",
+ "Ninna (885–889)",
+ "Kanpyō (889–898)",
+ "Shōtai (898–901)",
+ "Engi (901–923)",
+ "Enchō (923–931)",
+ "Jōhei (931–938)",
+ "Tengyō (938–947)",
+ "Tenryaku (947–957)",
+ "Tentoku (957–961)",
+ "Ōwa (961–964)",
+ "Kōhō (964–968)",
+ "Anna (968–970)",
+ "Tenroku (970–973)",
+ "Ten’en (973–976)",
+ "Jōgen (976–978)",
+ "Tengen (978–983)",
+ "Eikan (983–985)",
+ "Kanna (985–987)",
+ "Eien (987–989)",
+ "Eiso (989–990)",
+ "Shōryaku (990–995)",
+ "Chōtoku (995–999)",
+ "Chōhō (999–1004)",
+ "Kankō (1004–1012)",
+ "Chōwa (1012–1017)",
+ "Kannin (1017–1021)",
+ "Jian (1021–1024)",
+ "Manju (1024–1028)",
+ "Chōgen (1028–1037)",
+ "Chōryaku (1037–1040)",
+ "Chōkyū (1040–1044)",
+ "Kantoku (1044–1046)",
+ "Eishō (1046–1053)",
+ "Tengi (1053–1058)",
+ "Kōhei (1058–1065)",
+ "Jiryaku (1065–1069)",
+ "Enkyū (1069–1074)",
+ "Shōho (1074–1077)",
+ "Shōryaku (1077–1081)",
+ "Eihō (1081–1084)",
+ "Ōtoku (1084–1087)",
+ "Kanji (1087–1094)",
+ "Kahō (1094–1096)",
+ "Eichō (1096–1097)",
+ "Jōtoku (1097–1099)",
+ "Kōwa (1099–1104)",
+ "Chōji (1104–1106)",
+ "Kashō (1106–1108)",
+ "Tennin (1108–1110)",
+ "Ten-ei (1110–1113)",
+ "Eikyū (1113–1118)",
+ "Gen’ei (1118–1120)",
+ "Hōan (1120–1124)",
+ "Tenji (1124–1126)",
+ "Daiji (1126–1131)",
+ "Tenshō (1131–1132)",
+ "Chōshō (1132–1135)",
+ "Hōen (1135–1141)",
+ "Eiji (1141–1142)",
+ "Kōji (1142–1144)",
+ "Ten’yō (1144–1145)",
+ "Kyūan (1145–1151)",
+ "Ninpei (1151–1154)",
+ "Kyūju (1154–1156)",
+ "Hōgen (1156–1159)",
+ "Heiji (1159–1160)",
+ "Eiryaku (1160–1161)",
+ "Ōho (1161–1163)",
+ "Chōkan (1163–1165)",
+ "Eiman (1165–1166)",
+ "Nin’an (1166–1169)",
+ "Kaō (1169–1171)",
+ "Shōan (1171–1175)",
+ "Angen (1175–1177)",
+ "Jishō (1177–1181)",
+ "Yōwa (1181–1182)",
+ "Juei (1182–1184)",
+ "Genryaku (1184–1185)",
+ "Bunji (1185–1190)",
+ "Kenkyū (1190–1199)",
+ "Shōji (1199–1201)",
+ "Kennin (1201–1204)",
+ "Genkyū (1204–1206)",
+ "Ken’ei (1206–1207)",
+ "Jōgen (1207–1211)",
+ "Kenryaku (1211–1213)",
+ "Kenpō (1213–1219)",
+ "Jōkyū (1219–1222)",
+ "Jōō (1222–1224)",
+ "Gennin (1224–1225)",
+ "Karoku (1225–1227)",
+ "Antei (1227–1229)",
+ "Kanki (1229–1232)",
+ "Jōei (1232–1233)",
+ "Tenpuku (1233–1234)",
+ "Bunryaku (1234–1235)",
+ "Katei (1235–1238)",
+ "Ryakunin (1238–1239)",
+ "En’ō (1239–1240)",
+ "Ninji (1240–1243)",
+ "Kangen (1243–1247)",
+ "Hōji (1247–1249)",
+ "Kenchō (1249–1256)",
+ "Kōgen (1256–1257)",
+ "Shōka (1257–1259)",
+ "Shōgen (1259–1260)",
+ "Bun’ō (1260–1261)",
+ "Kōchō (1261–1264)",
+ "Bun’ei (1264–1275)",
+ "Kenji (1275–1278)",
+ "Kōan (1278–1288)",
+ "Shōō (1288–1293)",
+ "Einin (1293–1299)",
+ "Shōan (1299–1302)",
+ "Kengen (1302–1303)",
+ "Kagen (1303–1306)",
+ "Tokuji (1306–1308)",
+ "Enkyō (1308–1311)",
+ "Ōchō (1311–1312)",
+ "Shōwa (1312–1317)",
+ "Bunpō (1317–1319)",
+ "Genō (1319–1321)",
+ "Genkō (1321–1324)",
+ "Shōchū (1324–1326)",
+ "Karyaku (1326–1329)",
+ "Gentoku (1329–1331)",
+ "Genkō (1331–1334)",
+ "Kenmu (1334–1336)",
+ "Engen (1336–1340)",
+ "Kōkoku (1340–1346)",
+ "Shōhei (1346–1370)",
+ "Kentoku (1370–1372)",
+ "Bunchū (1372–1375)",
+ "Tenju (1375–1379)",
+ "Kōryaku (1379–1381)",
+ "Kōwa (1381–1384)",
+ "Genchū (1384–1392)",
+ "Meitoku (1384–1387)",
+ "Kakei (1387–1389)",
+ "Kōō (1389–1390)",
+ "Meitoku (1390–1394)",
+ "Ōei (1394–1428)",
+ "Shōchō (1428–1429)",
+ "Eikyō (1429–1441)",
+ "Kakitsu (1441–1444)",
+ "Bun’an (1444–1449)",
+ "Hōtoku (1449–1452)",
+ "Kyōtoku (1452–1455)",
+ "Kōshō (1455–1457)",
+ "Chōroku (1457–1460)",
+ "Kanshō (1460–1466)",
+ "Bunshō (1466–1467)",
+ "Ōnin (1467–1469)",
+ "Bunmei (1469–1487)",
+ "Chōkyō (1487–1489)",
+ "Entoku (1489–1492)",
+ "Meiō (1492–1501)",
+ "Bunki (1501–1504)",
+ "Eishō (1504–1521)",
+ "Taiei (1521–1528)",
+ "Kyōroku (1528–1532)",
+ "Tenbun (1532–1555)",
+ "Kōji (1555–1558)",
+ "Eiroku (1558–1570)",
+ "Genki (1570–1573)",
+ "Tenshō (1573–1592)",
+ "Bunroku (1592–1596)",
+ "Keichō (1596–1615)",
+ "Genna (1615–1624)",
+ "Kan’ei (1624–1644)",
+ "Shōho (1644–1648)",
+ "Keian (1648–1652)",
+ "Jōō (1652–1655)",
+ "Meireki (1655–1658)",
+ "Manji (1658–1661)",
+ "Kanbun (1661–1673)",
+ "Enpō (1673–1681)",
+ "Tenna (1681–1684)",
+ "Jōkyō (1684–1688)",
+ "Genroku (1688–1704)",
+ "Hōei (1704–1711)",
+ "Shōtoku (1711–1716)",
+ "Kyōhō (1716–1736)",
+ "Genbun (1736–1741)",
+ "Kanpō (1741–1744)",
+ "Enkyō (1744–1748)",
+ "Kan’en (1748–1751)",
+ "Hōreki (1751–1764)",
+ "Meiwa (1764–1772)",
+ "An’ei (1772–1781)",
+ "Tenmei (1781–1789)",
+ "Kansei (1789–1801)",
+ "Kyōwa (1801–1804)",
+ "Bunka (1804–1818)",
+ "Bunsei (1818–1830)",
+ "Tenpō (1830–1844)",
+ "Kōka (1844–1848)",
+ "Kaei (1848–1854)",
+ "Ansei (1854–1860)",
+ "Man’en (1860–1861)",
+ "Bunkyū (1861–1864)",
+ "Genji (1864–1865)",
+ "Keiō (1865–1868)",
+ "Meiji",
+ "Taishō",
+ "Shōwa",
+ "Χεϊσέι",
+ "Ρέιβα",
+ }
+ }
}
roc{
eras{
diff --git a/source/data/locales/es.txt b/source/data/locales/es.txt
index 9f461b0..a1de1b4 100644
--- a/source/data/locales/es.txt
+++ b/source/data/locales/es.txt
@@ -212,7 +212,7 @@
minimumGroupingDigits{"2"}
native{"latn"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
calendar{
chinese{
DateTimePatterns{
diff --git a/source/data/locales/eu.txt b/source/data/locales/eu.txt
index 06a29dd..4f91b77 100644
--- a/source/data/locales/eu.txt
+++ b/source/data/locales/eu.txt
@@ -209,7 +209,7 @@
}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
diff --git a/source/data/locales/fa.txt b/source/data/locales/fa.txt
index ebc7ed6..6fce796 100644
--- a/source/data/locales/fa.txt
+++ b/source/data/locales/fa.txt
@@ -240,7 +240,7 @@
minimumGroupingDigits{"1"}
native{"arabext"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
@@ -1530,6 +1530,249 @@
}
}
}
+ japanese{
+ eras{
+ abbreviated{
+ "Taika (645–650)",
+ "Hakuchi (650–671)",
+ "Hakuhō (672–686)",
+ "Shuchō (686–701)",
+ "Taihō (701–704)",
+ "Keiun (704–708)",
+ "Wadō (708–715)",
+ "Reiki (715–717)",
+ "Yōrō (717–724)",
+ "Jinki (724–729)",
+ "Tenpyō (729–749)",
+ "Tenpyō-kampō (749–749)",
+ "Tenpyō-shōhō (749–757)",
+ "Tenpyō-hōji (757–765)",
+ "Tenpyō-jingo (765–767)",
+ "Jingo-keiun (767–770)",
+ "Hōki (770–780)",
+ "Ten-ō (781–782)",
+ "Enryaku (782–806)",
+ "Daidō (806–810)",
+ "Kōnin (810–824)",
+ "Tenchō (824–834)",
+ "Jōwa (834–848)",
+ "Kajō (848–851)",
+ "Ninju (851–854)",
+ "Saikō (854–857)",
+ "Ten-an (857–859)",
+ "Jōgan (859–877)",
+ "Gangyō (877–885)",
+ "Ninna (885–889)",
+ "Kanpyō (889–898)",
+ "Shōtai (898–901)",
+ "Engi (901–923)",
+ "Enchō (923–931)",
+ "Jōhei (931–938)",
+ "Tengyō (938–947)",
+ "Tenryaku (947–957)",
+ "Tentoku (957–961)",
+ "Ōwa (961–964)",
+ "Kōhō (964–968)",
+ "Anna (968–970)",
+ "Tenroku (970–973)",
+ "Ten’en (973–976)",
+ "Jōgen (976–978)",
+ "Tengen (978–983)",
+ "Eikan (983–985)",
+ "Kanna (985–987)",
+ "Eien (987–989)",
+ "Eiso (989–990)",
+ "Shōryaku (990–995)",
+ "Chōtoku (995–999)",
+ "Chōhō (999–1004)",
+ "Kankō (1004–1012)",
+ "Chōwa (1012–1017)",
+ "Kannin (1017–1021)",
+ "Jian (1021–1024)",
+ "Manju (1024–1028)",
+ "Chōgen (1028–1037)",
+ "Chōryaku (1037–1040)",
+ "Chōkyū (1040–1044)",
+ "Kantoku (1044–1046)",
+ "Eishō (1046–1053)",
+ "Tengi (1053–1058)",
+ "Kōhei (1058–1065)",
+ "Jiryaku (1065–1069)",
+ "Enkyū (1069–1074)",
+ "Shōho (1074–1077)",
+ "Shōryaku (1077–1081)",
+ "Eihō (1081–1084)",
+ "Ōtoku (1084–1087)",
+ "Kanji (1087–1094)",
+ "Kahō (1094–1096)",
+ "Eichō (1096–1097)",
+ "Jōtoku (1097–1099)",
+ "Kōwa (1099–1104)",
+ "Chōji (1104–1106)",
+ "Kashō (1106–1108)",
+ "Tennin (1108–1110)",
+ "Ten-ei (1110–1113)",
+ "Eikyū (1113–1118)",
+ "Gen’ei (1118–1120)",
+ "Hōan (1120–1124)",
+ "Tenji (1124–1126)",
+ "Daiji (1126–1131)",
+ "Tenshō (1131–1132)",
+ "Chōshō (1132–1135)",
+ "Hōen (1135–1141)",
+ "Eiji (1141–1142)",
+ "Kōji (1142–1144)",
+ "Ten’yō (1144–1145)",
+ "Kyūan (1145–1151)",
+ "Ninpei (1151–1154)",
+ "Kyūju (1154–1156)",
+ "Hōgen (1156–1159)",
+ "Heiji (1159–1160)",
+ "Eiryaku (1160–1161)",
+ "Ōho (1161–1163)",
+ "Chōkan (1163–1165)",
+ "Eiman (1165–1166)",
+ "Nin’an (1166–1169)",
+ "Kaō (1169–1171)",
+ "Shōan (1171–1175)",
+ "Angen (1175–1177)",
+ "Jishō (1177–1181)",
+ "Yōwa (1181–1182)",
+ "Juei (1182–1184)",
+ "Genryaku (1184–1185)",
+ "Bunji (1185–1190)",
+ "Kenkyū (1190–1199)",
+ "Shōji (1199–1201)",
+ "Kennin (1201–1204)",
+ "Genkyū (1204–1206)",
+ "Ken’ei (1206–1207)",
+ "Jōgen (1207–1211)",
+ "Kenryaku (1211–1213)",
+ "Kenpō (1213–1219)",
+ "Jōkyū (1219–1222)",
+ "Jōō (1222–1224)",
+ "Gennin (1224–1225)",
+ "Karoku (1225–1227)",
+ "Antei (1227–1229)",
+ "Kanki (1229–1232)",
+ "Jōei (1232–1233)",
+ "Tenpuku (1233–1234)",
+ "Bunryaku (1234–1235)",
+ "Katei (1235–1238)",
+ "Ryakunin (1238–1239)",
+ "En’ō (1239–1240)",
+ "Ninji (1240–1243)",
+ "Kangen (1243–1247)",
+ "Hōji (1247–1249)",
+ "Kenchō (1249–1256)",
+ "Kōgen (1256–1257)",
+ "Shōka (1257–1259)",
+ "Shōgen (1259–1260)",
+ "Bun’ō (1260–1261)",
+ "Kōchō (1261–1264)",
+ "Bun’ei (1264–1275)",
+ "Kenji (1275–1278)",
+ "Kōan (1278–1288)",
+ "Shōō (1288–1293)",
+ "Einin (1293–1299)",
+ "Shōan (1299–1302)",
+ "Kengen (1302–1303)",
+ "Kagen (1303–1306)",
+ "Tokuji (1306–1308)",
+ "Enkyō (1308–1311)",
+ "Ōchō (1311–1312)",
+ "Shōwa (1312–1317)",
+ "Bunpō (1317–1319)",
+ "Genō (1319–1321)",
+ "Genkō (1321–1324)",
+ "Shōchū (1324–1326)",
+ "Karyaku (1326–1329)",
+ "Gentoku (1329–1331)",
+ "Genkō (1331–1334)",
+ "Kenmu (1334–1336)",
+ "Engen (1336–1340)",
+ "Kōkoku (1340–1346)",
+ "Shōhei (1346–1370)",
+ "Kentoku (1370–1372)",
+ "Bunchū (1372–1375)",
+ "Tenju (1375–1379)",
+ "Kōryaku (1379–1381)",
+ "Kōwa (1381–1384)",
+ "Genchū (1384–1392)",
+ "Meitoku (1384–1387)",
+ "Kakei (1387–1389)",
+ "Kōō (1389–1390)",
+ "Meitoku (1390–1394)",
+ "Ōei (1394–1428)",
+ "Shōchō (1428–1429)",
+ "Eikyō (1429–1441)",
+ "Kakitsu (1441–1444)",
+ "Bun’an (1444–1449)",
+ "Hōtoku (1449–1452)",
+ "Kyōtoku (1452–1455)",
+ "Kōshō (1455–1457)",
+ "Chōroku (1457–1460)",
+ "Kanshō (1460–1466)",
+ "Bunshō (1466–1467)",
+ "Ōnin (1467–1469)",
+ "Bunmei (1469–1487)",
+ "Chōkyō (1487–1489)",
+ "Entoku (1489–1492)",
+ "Meiō (1492–1501)",
+ "Bunki (1501–1504)",
+ "Eishō (1504–1521)",
+ "Taiei (1521–1528)",
+ "Kyōroku (1528–1532)",
+ "Tenbun (1532–1555)",
+ "Kōji (1555–1558)",
+ "Eiroku (1558–1570)",
+ "Genki (1570–1573)",
+ "Tenshō (1573–1592)",
+ "Bunroku (1592–1596)",
+ "Keichō (1596–1615)",
+ "Genna (1615–1624)",
+ "Kan’ei (1624–1644)",
+ "Shōho (1644–1648)",
+ "Keian (1648–1652)",
+ "Jōō (1652–1655)",
+ "Meireki (1655–1658)",
+ "Manji (1658–1661)",
+ "Kanbun (1661–1673)",
+ "Enpō (1673–1681)",
+ "Tenna (1681–1684)",
+ "Jōkyō (1684–1688)",
+ "Genroku (1688–1704)",
+ "Hōei (1704–1711)",
+ "Shōtoku (1711–1716)",
+ "Kyōhō (1716–1736)",
+ "Genbun (1736–1741)",
+ "Kanpō (1741–1744)",
+ "Enkyō (1744–1748)",
+ "Kan’en (1748–1751)",
+ "Hōreki (1751–1764)",
+ "Meiwa (1764–1772)",
+ "An’ei (1772–1781)",
+ "Tenmei (1781–1789)",
+ "Kansei (1789–1801)",
+ "Kyōwa (1801–1804)",
+ "Bunka (1804–1818)",
+ "Bunsei (1818–1830)",
+ "Tenpō (1830–1844)",
+ "Kōka (1844–1848)",
+ "Kaei (1848–1854)",
+ "Ansei (1854–1860)",
+ "Man’en (1860–1861)",
+ "Bunkyū (1861–1864)",
+ "Genji (1864–1865)",
+ "Keiō (1865–1868)",
+ "Meiji",
+ "Taishō",
+ "Shōwa",
+ "هیسهای",
+ "ریوا",
+ }
+ }
+ }
persian{
DateTimePatterns{
"H:mm:ss (zzzz)",
diff --git a/source/data/locales/fil.txt b/source/data/locales/fil.txt
index 417c572..21c09df 100644
--- a/source/data/locales/fil.txt
+++ b/source/data/locales/fil.txt
@@ -205,7 +205,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/fr.txt b/source/data/locales/fr.txt
index 4b0ca69..cfe1776 100644
--- a/source/data/locales/fr.txt
+++ b/source/data/locales/fr.txt
@@ -218,7 +218,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.43"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/ga.txt b/source/data/locales/ga.txt
index 386f906..bfd56f9 100644
--- a/source/data/locales/ga.txt
+++ b/source/data/locales/ga.txt
@@ -320,7 +320,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/gd.txt b/source/data/locales/gd.txt
index 415f1e6..ac56358 100644
--- a/source/data/locales/gd.txt
+++ b/source/data/locales/gd.txt
@@ -1106,7 +1106,7 @@
}
}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/gl.txt b/source/data/locales/gl.txt
index db634c7..f3eb822 100644
--- a/source/data/locales/gl.txt
+++ b/source/data/locales/gl.txt
@@ -209,7 +209,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/he.txt b/source/data/locales/he.txt
index deaac88..1d7cfaf 100644
--- a/source/data/locales/he.txt
+++ b/source/data/locales/he.txt
@@ -1785,7 +1785,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
}
diff --git a/source/data/locales/hi.txt b/source/data/locales/hi.txt
index 60a5dd7..efd8246 100644
--- a/source/data/locales/hi.txt
+++ b/source/data/locales/hi.txt
@@ -220,7 +220,7 @@
minimumGroupingDigits{"1"}
native{"deva"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
ethiopic{
monthNames{
@@ -1317,7 +1317,7 @@
"ताईशो",
"शोवा",
"हेईसेई",
- "Qqqq",
+ "रेइवा",
}
}
}
diff --git a/source/data/locales/hr.txt b/source/data/locales/hr.txt
index 338c140..2be9658 100644
--- a/source/data/locales/hr.txt
+++ b/source/data/locales/hr.txt
@@ -1380,7 +1380,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
}
diff --git a/source/data/locales/hy.txt b/source/data/locales/hy.txt
index 2ccf8c8..7936edd 100644
--- a/source/data/locales/hy.txt
+++ b/source/data/locales/hy.txt
@@ -210,7 +210,7 @@
minimumGroupingDigits{"1"}
traditional{"armn"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/id.txt b/source/data/locales/id.txt
index 2e5f820..15116ce 100644
--- a/source/data/locales/id.txt
+++ b/source/data/locales/id.txt
@@ -1665,7 +1665,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
}
diff --git a/source/data/locales/is.txt b/source/data/locales/is.txt
index a370898..a610581 100644
--- a/source/data/locales/is.txt
+++ b/source/data/locales/is.txt
@@ -210,7 +210,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/ja.txt b/source/data/locales/ja.txt
index d3c96a1..41007d6 100644
--- a/source/data/locales/ja.txt
+++ b/source/data/locales/ja.txt
@@ -227,7 +227,7 @@
minimumGroupingDigits{"1"}
traditional{"jpan"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -2342,7 +2342,7 @@
"大正",
"昭和",
"平成",
- "ＱＱ",
+ "令和",
}
narrow{
"大化",
@@ -2581,7 +2581,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
}
}
diff --git a/source/data/locales/kk.txt b/source/data/locales/kk.txt
index 7f662e7..0cb3348 100644
--- a/source/data/locales/kk.txt
+++ b/source/data/locales/kk.txt
@@ -216,7 +216,7 @@
}
native{"latn"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/km.txt b/source/data/locales/km.txt
index 8250c2e..cdd9bd7 100644
--- a/source/data/locales/km.txt
+++ b/source/data/locales/km.txt
@@ -174,7 +174,7 @@
}
native{"khmr"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/ko.txt b/source/data/locales/ko.txt
index bc4a0bb..553854f 100644
--- a/source/data/locales/ko.txt
+++ b/source/data/locales/ko.txt
@@ -191,7 +191,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
availableFormats{
@@ -2004,7 +2004,7 @@
"다이쇼",
"쇼와",
"헤이세이",
- "Qqqq",
+ "레이와",
}
}
}
diff --git a/source/data/locales/kok.txt b/source/data/locales/kok.txt
index 6f89302..cee1f72 100644
--- a/source/data/locales/kok.txt
+++ b/source/data/locales/kok.txt
@@ -188,7 +188,7 @@
minimumGroupingDigits{"1"}
native{"deva"}
}
- Version{"2.1.48.4"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/ky.txt b/source/data/locales/ky.txt
index 092aef7..c481315 100644
--- a/source/data/locales/ky.txt
+++ b/source/data/locales/ky.txt
@@ -214,7 +214,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/lb.txt b/source/data/locales/lb.txt
index 7abde98..6841e31 100644
--- a/source/data/locales/lb.txt
+++ b/source/data/locales/lb.txt
@@ -156,7 +156,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
diff --git a/source/data/locales/lo.txt b/source/data/locales/lo.txt
index 7a84cab..3864a99 100644
--- a/source/data/locales/lo.txt
+++ b/source/data/locales/lo.txt
@@ -1913,7 +1913,7 @@
"ໄຕໂຊ",
"ໂຊວາ",
"ຮີຊີ",
- "Qqqq",
+ "Reiwa",
}
}
}
diff --git a/source/data/locales/lt.txt b/source/data/locales/lt.txt
index 80c5715..6f74634 100644
--- a/source/data/locales/lt.txt
+++ b/source/data/locales/lt.txt
@@ -2250,7 +2250,7 @@
"Taišo",
"Šova",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
}
diff --git a/source/data/locales/mi.txt b/source/data/locales/mi.txt
index 0a09045..a4c4f61 100644
--- a/source/data/locales/mi.txt
+++ b/source/data/locales/mi.txt
@@ -152,7 +152,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/mt.txt b/source/data/locales/mt.txt
index 74757a7..4216dc3 100644
--- a/source/data/locales/mt.txt
+++ b/source/data/locales/mt.txt
@@ -48,7 +48,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.47.72"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/my.txt b/source/data/locales/my.txt
index 51e6e74..29c7374 100644
--- a/source/data/locales/my.txt
+++ b/source/data/locales/my.txt
@@ -198,7 +198,7 @@
}
native{"mymr"}
}
- Version{"2.1.48.36"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/nb.txt b/source/data/locales/nb.txt
index cf7a052..91b1668 100644
--- a/source/data/locales/nb.txt
+++ b/source/data/locales/nb.txt
@@ -3392,7 +3392,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
wide{
"Taika (645–650)",
@@ -3631,7 +3631,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
intervalFormats{
diff --git a/source/data/locales/ne.txt b/source/data/locales/ne.txt
index ce72afa..f242e09 100644
--- a/source/data/locales/ne.txt
+++ b/source/data/locales/ne.txt
@@ -224,7 +224,7 @@
}
native{"deva"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/nl.txt b/source/data/locales/nl.txt
index 9f848ef..52cb88d 100644
--- a/source/data/locales/nl.txt
+++ b/source/data/locales/nl.txt
@@ -810,7 +810,7 @@
}
}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -3533,7 +3533,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
narrow{
"Taika (645–650)",
@@ -3772,7 +3772,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
wide{
"Taika (645–650)",
@@ -4011,7 +4011,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
intervalFormats{
diff --git a/source/data/locales/nn.txt b/source/data/locales/nn.txt
index 73711c7..ddccd05 100644
--- a/source/data/locales/nn.txt
+++ b/source/data/locales/nn.txt
@@ -98,7 +98,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/or.txt b/source/data/locales/or.txt
index a796d6a..6e7f814 100644
--- a/source/data/locales/or.txt
+++ b/source/data/locales/or.txt
@@ -231,7 +231,7 @@
}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/ps.txt b/source/data/locales/ps.txt
index 5c5a339..d30e20f 100644
--- a/source/data/locales/ps.txt
+++ b/source/data/locales/ps.txt
@@ -232,7 +232,7 @@
minimumGroupingDigits{"1"}
native{"arabext"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
default{"persian"}
generic{
diff --git a/source/data/locales/pt_PT.txt b/source/data/locales/pt_PT.txt
index 12ac842..defe561 100644
--- a/source/data/locales/pt_PT.txt
+++ b/source/data/locales/pt_PT.txt
@@ -174,7 +174,7 @@
minimumGroupingDigits{"2"}
native{"latn"}
}
- Version{"2.1.47.89"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/qu.txt b/source/data/locales/qu.txt
index 7c49468..32c752a 100644
--- a/source/data/locales/qu.txt
+++ b/source/data/locales/qu.txt
@@ -156,7 +156,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/ro.txt b/source/data/locales/ro.txt
index fa894d8..57b9cf8 100644
--- a/source/data/locales/ro.txt
+++ b/source/data/locales/ro.txt
@@ -245,7 +245,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
diff --git a/source/data/locales/root.txt b/source/data/locales/root.txt
index 97e124c..258d00a 100644
--- a/source/data/locales/root.txt
+++ b/source/data/locales/root.txt
@@ -174,7 +174,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
@@ -1818,7 +1818,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
narrow{
"Taika (645–650)",
@@ -2057,7 +2057,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
wide:alias{"/LOCALE/calendar/japanese/eras/abbreviated"}
}
diff --git a/source/data/locales/ru.txt b/source/data/locales/ru.txt
index e6cc2c9..2f2689f 100644
--- a/source/data/locales/ru.txt
+++ b/source/data/locales/ru.txt
@@ -291,7 +291,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
@@ -1780,7 +1780,7 @@
"Эпоха Тайсьо",
"Сьова",
"Эпоха Хэйсэй",
- "Qqqq",
+ "Рэйва",
}
}
}
diff --git a/source/data/locales/rw.txt b/source/data/locales/rw.txt
index 6607a6c..5b93e5e 100644
--- a/source/data/locales/rw.txt
+++ b/source/data/locales/rw.txt
@@ -32,7 +32,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/sd.txt b/source/data/locales/sd.txt
index 2efd343..7b2baf7 100644
--- a/source/data/locales/sd.txt
+++ b/source/data/locales/sd.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
sd{
- AuxExemplarCharacters{"[ئ]"}
+ AuxExemplarCharacters{"[\u064E \u064F \u0650 ئ]"}
Ellipsis{
final{"{0}…"}
initial{"…{0}"}
@@ -210,7 +210,7 @@
}
native{"arab"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/so.txt b/source/data/locales/so.txt
index bdb661b..8dd8b74 100644
--- a/source/data/locales/so.txt
+++ b/source/data/locales/so.txt
@@ -213,7 +213,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/sr.txt b/source/data/locales/sr.txt
index 8433af3..36beb24 100644
--- a/source/data/locales/sr.txt
+++ b/source/data/locales/sr.txt
@@ -242,7 +242,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
@@ -1337,7 +1337,7 @@
"Таишо",
"Шова",
"Хаисеи",
- "Qqqq",
+ "Реива",
}
}
}
diff --git a/source/data/locales/sr_Latn.txt b/source/data/locales/sr_Latn.txt
index 27de4fc..fa053fe 100644
--- a/source/data/locales/sr_Latn.txt
+++ b/source/data/locales/sr_Latn.txt
@@ -243,7 +243,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.77"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
@@ -1338,7 +1338,7 @@
"Taišo",
"Šova",
"Haisei",
- "Qqqq",
+ "Reiva",
}
}
}
diff --git a/source/data/locales/sv.txt b/source/data/locales/sv.txt
index 143f4b2..2f6f223 100644
--- a/source/data/locales/sv.txt
+++ b/source/data/locales/sv.txt
@@ -1543,7 +1543,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
intervalFormats{
diff --git a/source/data/locales/th.txt b/source/data/locales/th.txt
index 80bb525..26bb910 100644
--- a/source/data/locales/th.txt
+++ b/source/data/locales/th.txt
@@ -173,7 +173,7 @@
minimumGroupingDigits{"1"}
native{"thai"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -2118,7 +2118,7 @@
"ทะอิโช",
"โชวะ",
"เฮเซ",
- "Qqqq",
+ "เรวะ",
}
}
}
diff --git a/source/data/locales/ti.txt b/source/data/locales/ti.txt
index 28f8d07..ec1d2ce 100644
--- a/source/data/locales/ti.txt
+++ b/source/data/locales/ti.txt
@@ -202,7 +202,7 @@
native{"latn"}
traditional{"ethi"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/tk.txt b/source/data/locales/tk.txt
index e5d576a..d6874cd 100644
--- a/source/data/locales/tk.txt
+++ b/source/data/locales/tk.txt
@@ -208,7 +208,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/tt.txt b/source/data/locales/tt.txt
index f1a1cc6..3f1bbcf 100644
--- a/source/data/locales/tt.txt
+++ b/source/data/locales/tt.txt
@@ -35,7 +35,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/ug.txt b/source/data/locales/ug.txt
index f358c22..b5a3d6b 100644
--- a/source/data/locales/ug.txt
+++ b/source/data/locales/ug.txt
@@ -149,7 +149,7 @@
}
native{"arabext"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
diff --git a/source/data/locales/uk.txt b/source/data/locales/uk.txt
index f4f0d29..a1d8e2a 100644
--- a/source/data/locales/uk.txt
+++ b/source/data/locales/uk.txt
@@ -280,7 +280,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
eras{
@@ -1266,6 +1266,249 @@
}
}
}
+ japanese{
+ eras{
+ abbreviated{
+ "Taika (645–650)",
+ "Hakuchi (650–671)",
+ "Hakuhō (672–686)",
+ "Shuchō (686–701)",
+ "Taihō (701–704)",
+ "Keiun (704–708)",
+ "Wadō (708–715)",
+ "Reiki (715–717)",
+ "Yōrō (717–724)",
+ "Jinki (724–729)",
+ "Tenpyō (729–749)",
+ "Tenpyō-kampō (749–749)",
+ "Tenpyō-shōhō (749–757)",
+ "Tenpyō-hōji (757–765)",
+ "Tenpyō-jingo (765–767)",
+ "Jingo-keiun (767–770)",
+ "Hōki (770–780)",
+ "Ten-ō (781–782)",
+ "Enryaku (782–806)",
+ "Daidō (806–810)",
+ "Kōnin (810–824)",
+ "Tenchō (824–834)",
+ "Jōwa (834–848)",
+ "Kajō (848–851)",
+ "Ninju (851–854)",
+ "Saikō (854–857)",
+ "Ten-an (857–859)",
+ "Jōgan (859–877)",
+ "Gangyō (877–885)",
+ "Ninna (885–889)",
+ "Kanpyō (889–898)",
+ "Shōtai (898–901)",
+ "Engi (901–923)",
+ "Enchō (923–931)",
+ "Jōhei (931–938)",
+ "Tengyō (938–947)",
+ "Tenryaku (947–957)",
+ "Tentoku (957–961)",
+ "Ōwa (961–964)",
+ "Kōhō (964–968)",
+ "Anna (968–970)",
+ "Tenroku (970–973)",
+ "Ten’en (973–976)",
+ "Jōgen (976–978)",
+ "Tengen (978–983)",
+ "Eikan (983–985)",
+ "Kanna (985–987)",
+ "Eien (987–989)",
+ "Eiso (989–990)",
+ "Shōryaku (990–995)",
+ "Chōtoku (995–999)",
+ "Chōhō (999–1004)",
+ "Kankō (1004–1012)",
+ "Chōwa (1012–1017)",
+ "Kannin (1017–1021)",
+ "Jian (1021–1024)",
+ "Manju (1024–1028)",
+ "Chōgen (1028–1037)",
+ "Chōryaku (1037–1040)",
+ "Chōkyū (1040–1044)",
+ "Kantoku (1044–1046)",
+ "Eishō (1046–1053)",
+ "Tengi (1053–1058)",
+ "Kōhei (1058–1065)",
+ "Jiryaku (1065–1069)",
+ "Enkyū (1069–1074)",
+ "Shōho (1074–1077)",
+ "Shōryaku (1077–1081)",
+ "Eihō (1081–1084)",
+ "Ōtoku (1084–1087)",
+ "Kanji (1087–1094)",
+ "Kahō (1094–1096)",
+ "Eichō (1096–1097)",
+ "Jōtoku (1097–1099)",
+ "Kōwa (1099–1104)",
+ "Chōji (1104–1106)",
+ "Kashō (1106–1108)",
+ "Tennin (1108–1110)",
+ "Ten-ei (1110–1113)",
+ "Eikyū (1113–1118)",
+ "Gen’ei (1118–1120)",
+ "Hōan (1120–1124)",
+ "Tenji (1124–1126)",
+ "Daiji (1126–1131)",
+ "Tenshō (1131–1132)",
+ "Chōshō (1132–1135)",
+ "Hōen (1135–1141)",
+ "Eiji (1141–1142)",
+ "Kōji (1142–1144)",
+ "Ten’yō (1144–1145)",
+ "Kyūan (1145–1151)",
+ "Ninpei (1151–1154)",
+ "Kyūju (1154–1156)",
+ "Hōgen (1156–1159)",
+ "Heiji (1159–1160)",
+ "Eiryaku (1160–1161)",
+ "Ōho (1161–1163)",
+ "Chōkan (1163–1165)",
+ "Eiman (1165–1166)",
+ "Nin’an (1166–1169)",
+ "Kaō (1169–1171)",
+ "Shōan (1171–1175)",
+ "Angen (1175–1177)",
+ "Jishō (1177–1181)",
+ "Yōwa (1181–1182)",
+ "Juei (1182–1184)",
+ "Genryaku (1184–1185)",
+ "Bunji (1185–1190)",
+ "Kenkyū (1190–1199)",
+ "Shōji (1199–1201)",
+ "Kennin (1201–1204)",
+ "Genkyū (1204–1206)",
+ "Ken’ei (1206–1207)",
+ "Jōgen (1207–1211)",
+ "Kenryaku (1211–1213)",
+ "Kenpō (1213–1219)",
+ "Jōkyū (1219–1222)",
+ "Jōō (1222–1224)",
+ "Gennin (1224–1225)",
+ "Karoku (1225–1227)",
+ "Antei (1227–1229)",
+ "Kanki (1229–1232)",
+ "Jōei (1232–1233)",
+ "Tenpuku (1233–1234)",
+ "Bunryaku (1234–1235)",
+ "Katei (1235–1238)",
+ "Ryakunin (1238–1239)",
+ "En’ō (1239–1240)",
+ "Ninji (1240–1243)",
+ "Kangen (1243–1247)",
+ "Hōji (1247–1249)",
+ "Kenchō (1249–1256)",
+ "Kōgen (1256–1257)",
+ "Shōka (1257–1259)",
+ "Shōgen (1259–1260)",
+ "Bun’ō (1260–1261)",
+ "Kōchō (1261–1264)",
+ "Bun’ei (1264–1275)",
+ "Kenji (1275–1278)",
+ "Kōan (1278–1288)",
+ "Shōō (1288–1293)",
+ "Einin (1293–1299)",
+ "Shōan (1299–1302)",
+ "Kengen (1302–1303)",
+ "Kagen (1303–1306)",
+ "Tokuji (1306–1308)",
+ "Enkyō (1308–1311)",
+ "Ōchō (1311–1312)",
+ "Shōwa (1312–1317)",
+ "Bunpō (1317–1319)",
+ "Genō (1319–1321)",
+ "Genkō (1321–1324)",
+ "Shōchū (1324–1326)",
+ "Karyaku (1326–1329)",
+ "Gentoku (1329–1331)",
+ "Genkō (1331–1334)",
+ "Kenmu (1334–1336)",
+ "Engen (1336–1340)",
+ "Kōkoku (1340–1346)",
+ "Shōhei (1346–1370)",
+ "Kentoku (1370–1372)",
+ "Bunchū (1372–1375)",
+ "Tenju (1375–1379)",
+ "Kōryaku (1379–1381)",
+ "Kōwa (1381–1384)",
+ "Genchū (1384–1392)",
+ "Meitoku (1384–1387)",
+ "Kakei (1387–1389)",
+ "Kōō (1389–1390)",
+ "Meitoku (1390–1394)",
+ "Ōei (1394–1428)",
+ "Shōchō (1428–1429)",
+ "Eikyō (1429–1441)",
+ "Kakitsu (1441–1444)",
+ "Bun’an (1444–1449)",
+ "Hōtoku (1449–1452)",
+ "Kyōtoku (1452–1455)",
+ "Kōshō (1455–1457)",
+ "Chōroku (1457–1460)",
+ "Kanshō (1460–1466)",
+ "Bunshō (1466–1467)",
+ "Ōnin (1467–1469)",
+ "Bunmei (1469–1487)",
+ "Chōkyō (1487–1489)",
+ "Entoku (1489–1492)",
+ "Meiō (1492–1501)",
+ "Bunki (1501–1504)",
+ "Eishō (1504–1521)",
+ "Taiei (1521–1528)",
+ "Kyōroku (1528–1532)",
+ "Tenbun (1532–1555)",
+ "Kōji (1555–1558)",
+ "Eiroku (1558–1570)",
+ "Genki (1570–1573)",
+ "Tenshō (1573–1592)",
+ "Bunroku (1592–1596)",
+ "Keichō (1596–1615)",
+ "Genna (1615–1624)",
+ "Kan’ei (1624–1644)",
+ "Shōho (1644–1648)",
+ "Keian (1648–1652)",
+ "Jōō (1652–1655)",
+ "Meireki (1655–1658)",
+ "Manji (1658–1661)",
+ "Kanbun (1661–1673)",
+ "Enpō (1673–1681)",
+ "Tenna (1681–1684)",
+ "Jōkyō (1684–1688)",
+ "Genroku (1688–1704)",
+ "Hōei (1704–1711)",
+ "Shōtoku (1711–1716)",
+ "Kyōhō (1716–1736)",
+ "Genbun (1736–1741)",
+ "Kanpō (1741–1744)",
+ "Enkyō (1744–1748)",
+ "Kan’en (1748–1751)",
+ "Hōreki (1751–1764)",
+ "Meiwa (1764–1772)",
+ "An’ei (1772–1781)",
+ "Tenmei (1781–1789)",
+ "Kansei (1789–1801)",
+ "Kyōwa (1801–1804)",
+ "Bunka (1804–1818)",
+ "Bunsei (1818–1830)",
+ "Tenpō (1830–1844)",
+ "Kōka (1844–1848)",
+ "Kaei (1848–1854)",
+ "Ansei (1854–1860)",
+ "Man’en (1860–1861)",
+ "Bunkyū (1861–1864)",
+ "Genji (1864–1865)",
+ "Keiō (1865–1868)",
+ "Meiji",
+ "Taishō",
+ "Shōwa",
+ "Хейсей",
+ "Рейва",
+ }
+ }
+ }
persian{
monthNames{
format{
diff --git a/source/data/locales/ur.txt b/source/data/locales/ur.txt
index cfd2aa2..b02f737 100644
--- a/source/data/locales/ur.txt
+++ b/source/data/locales/ur.txt
@@ -230,7 +230,7 @@
minimumGroupingDigits{"1"}
native{"arabext"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
calendar{
coptic{
eras{
diff --git a/source/data/locales/uz.txt b/source/data/locales/uz.txt
index 0c6afec..730a4d0 100644
--- a/source/data/locales/uz.txt
+++ b/source/data/locales/uz.txt
@@ -229,7 +229,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/uz_Cyrl.txt b/source/data/locales/uz_Cyrl.txt
index 8b8c990..1fe8552 100644
--- a/source/data/locales/uz_Cyrl.txt
+++ b/source/data/locales/uz_Cyrl.txt
@@ -165,7 +165,7 @@
}
}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/vi.txt b/source/data/locales/vi.txt
index d1ebc9b..67f12ce 100644
--- a/source/data/locales/vi.txt
+++ b/source/data/locales/vi.txt
@@ -205,7 +205,7 @@
}
minimumGroupingDigits{"1"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -2533,7 +2533,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
narrow{
"Taika (645–650)",
@@ -2772,7 +2772,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
wide{
"Taika (645–650)",
@@ -3011,7 +3011,7 @@
"Taishō",
"Shōwa",
"Heisei",
- "Qqqq",
+ "Reiwa",
}
}
intervalFormats{
diff --git a/source/data/locales/wo.txt b/source/data/locales/wo.txt
index 46e50aa..8aed2f4 100644
--- a/source/data/locales/wo.txt
+++ b/source/data/locales/wo.txt
@@ -34,7 +34,7 @@
minimumGroupingDigits{"1"}
native{"latn"}
}
- Version{"2.1.47.84"}
+ Version{"2.1.49.82"}
calendar{
generic{
DateTimePatterns{
diff --git a/source/data/locales/xh.txt b/source/data/locales/xh.txt
index e83f04a..dee82c8 100644
--- a/source/data/locales/xh.txt
+++ b/source/data/locales/xh.txt
@@ -20,7 +20,7 @@
}
}
}
- Version{"2.1.48.89"}
+ Version{"2.1.49.82"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/source/data/locales/yue.txt b/source/data/locales/yue.txt
index 8df95af..29a9bd5 100644
--- a/source/data/locales/yue.txt
+++ b/source/data/locales/yue.txt
@@ -250,7 +250,7 @@
native{"hanidec"}
traditional{"hant"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -2440,7 +2440,7 @@
"大正",
"昭和",
"平成",
- "Qqqq",
+ "令和",
}
}
}
diff --git a/source/data/locales/yue_Hans.txt b/source/data/locales/yue_Hans.txt
index 6429d63..e084f11 100644
--- a/source/data/locales/yue_Hans.txt
+++ b/source/data/locales/yue_Hans.txt
@@ -248,7 +248,7 @@
native{"hanidec"}
traditional{"hans"}
}
- Version{"2.1.48.80"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -2438,7 +2438,7 @@
"大正",
"昭和",
"平成",
- "Qqqq",
+ "令和",
}
}
}
diff --git a/source/data/locales/zh.txt b/source/data/locales/zh.txt
index 51ff7fe..597c9de 100644
--- a/source/data/locales/zh.txt
+++ b/source/data/locales/zh.txt
@@ -673,7 +673,7 @@
}
}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -3394,7 +3394,7 @@
"大正",
"昭和",
"平成",
- "Qqqq",
+ "令和",
}
narrow{
"大化(645–650)",
@@ -3633,7 +3633,7 @@
"T",
"S",
"H",
- "Q",
+ "R",
}
wide{
"大化 (645–650)",
@@ -3872,7 +3872,7 @@
"大正",
"昭和",
"平成",
- "Qqqq",
+ "令和",
}
}
intervalFormats{
diff --git a/source/data/locales/zh_Hant.txt b/source/data/locales/zh_Hant.txt
index 2aaa62c..1a9c8a2 100644
--- a/source/data/locales/zh_Hant.txt
+++ b/source/data/locales/zh_Hant.txt
@@ -787,7 +787,7 @@
}
}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
calendar{
buddhist{
DateTimePatterns{
@@ -4989,7 +4989,7 @@
"大正",
"昭和",
"平成",
- "Qqqq",
+ "令和",
}
narrow{
"大化",
@@ -5228,7 +5228,7 @@
"大正",
"昭和",
"平成",
- "Q",
+ "令和",
}
wide{
"大化",
@@ -5467,7 +5467,7 @@
"大正",
"昭和",
"平成",
- "Qqqq",
+ "令和",
}
}
intervalFormats{
diff --git a/source/data/makedata.mak b/source/data/makedata.mak
index 1f42124..75cdb2a 100644
--- a/source/data/makedata.mak
+++ b/source/data/makedata.mak
@@ -19,7 +19,7 @@
U_ICUDATA_NAME=icudt64
!ENDIF
U_ICUDATA_ENDIAN_SUFFIX=l
-UNICODE_VERSION=12.0
+UNICODE_VERSION=12.1
ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll
# ICUMAKE
diff --git a/source/data/misc/icuver.txt b/source/data/misc/icuver.txt
index dc4bf4c..94fbfe6 100644
--- a/source/data/misc/icuver.txt
+++ b/source/data/misc/icuver.txt
@@ -8,6 +8,6 @@
// ***************************************************************************
icuver:table(nofallback){
- DataVersion { "64.1.0.0" }
- ICUVersion { "64.1.0.0" }
+ DataVersion { "64.2.0.0" }
+ ICUVersion { "64.2.0.0" }
}
diff --git a/source/data/misc/supplementalData.txt b/source/data/misc/supplementalData.txt
index 1f3d63e..3b8232b 100644
--- a/source/data/misc/supplementalData.txt
+++ b/source/data/misc/supplementalData.txt
@@ -1263,7 +1263,6 @@
}
}
236{
- named{"false"}
start:intvector{
2019,
5,
@@ -2105,7 +2104,7 @@
"islamic-tbla",
}
}
- cldrVersion{"35"}
+ cldrVersion{"35.1"}
codeMappings{
{
"AA",
diff --git a/source/data/pkgdataMakefile.in b/source/data/pkgdataMakefile.in
index 4e21d03..721ba16 100644
--- a/source/data/pkgdataMakefile.in
+++ b/source/data/pkgdataMakefile.in
@@ -16,6 +16,7 @@
OUTPUTFILE=icupkg.inc
MIDDLE_SO_TARGET=
+PKGDATA_TRAILING_SPACE=" "
all : clean
@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
@@ -36,7 +37,6 @@
@echo RANLIB=$(RANLIB) >> $(OUTPUTFILE)
@echo INSTALL_CMD=$(INSTALL) >> $(OUTPUTFILE)
-
clean :
$(RMV) $(OUTPUTFILE)
diff --git a/source/data/region/am.txt b/source/data/region/am.txt
index d6e07bc..9421a37 100644
--- a/source/data/region/am.txt
+++ b/source/data/region/am.txt
@@ -183,7 +183,7 @@
MF{"ሴንት ማርቲን"}
MG{"ማዳጋስካር"}
MH{"ማርሻል አይላንድ"}
- MK{"መቄዶንያ"}
+ MK{"ሰሜን መቄዶንያ"}
ML{"ማሊ"}
MM{"ማይናማር(በርማ)"}
MN{"ሞንጎሊያ"}
@@ -305,9 +305,9 @@
CG{"ኮንጎ (ሪፐብሊክ)"}
CI{"አይቮሪኮስት"}
CZ{"ቼክ ሪፑብሊክ"}
- MK{"መቄዶንያ (የቀድሞ የዩጎስላቭ መቄዶንያ ሪፐብሊክ)"}
+ FK{"ፎክላንድ ደሴቶች (ኢስላስ ማልቪናስ)"}
SZ{"ስዋዚላንድ"}
TL{"ምስራቅ ቲሞር"}
}
- Version{"2.1.48.18"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ar.txt b/source/data/region/ar.txt
index f6122dd..2fd5c88 100644
--- a/source/data/region/ar.txt
+++ b/source/data/region/ar.txt
@@ -183,7 +183,7 @@
MF{"سان مارتن"}
MG{"مدغشقر"}
MH{"جزر مارشال"}
- MK{"مقدونيا"}
+ MK{"مقدونيا الشمالية"}
ML{"مالي"}
MM{"ميانمار (بورما)"}
MN{"منغوليا"}
@@ -306,8 +306,8 @@
CG{"جمهورية الكونغو"}
CI{"كوت ديفوار"}
CZ{"جمهورية التشيك"}
- MK{"مقدونيا- جمهورية مقدونيا اليوغسلافية السابقة"}
+ FK{"جزر فوكلاند - جزر مالفيناس"}
TL{"تيمور الشرقية"}
}
- Version{"2.1.48.22"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/az.txt b/source/data/region/az.txt
index c15f835..ad7d164 100644
--- a/source/data/region/az.txt
+++ b/source/data/region/az.txt
@@ -183,7 +183,7 @@
MF{"Sent Martin"}
MG{"Madaqaskar"}
MH{"Marşal adaları"}
- MK{"Makedoniya"}
+ MK{"Şimali Makedoniya"}
ML{"Mali"}
MM{"Myanma"}
MN{"Monqolustan"}
@@ -307,9 +307,9 @@
CG{"Konqo (Respublika)"}
CI{"Fil Dişi Sahili"}
CZ{"Çex Respublikası"}
- MK{"Makedoniya (KYRM)"}
+ FK{"Folklend adaları (Malvin adaları)"}
SZ{"Svazilend"}
TL{"Doğu Timor"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/be.txt b/source/data/region/be.txt
index fc027bd..12c1b04 100644
--- a/source/data/region/be.txt
+++ b/source/data/region/be.txt
@@ -183,7 +183,7 @@
MF{"Сен-Мартэн"}
MG{"Мадагаскар"}
MH{"Маршалавы астравы"}
- MK{"Македонія"}
+ MK{"Паўночная Македонія"}
ML{"Малі"}
MM{"М’янма (Бірма)"}
MN{"Манголія"}
@@ -304,9 +304,9 @@
CG{"Рэспубліка Конга"}
CI{"Бераг Слановай Косці"}
CZ{"Чэшская Рэспубліка"}
- MK{"Македонія (БЮРМ)"}
+ FK{"Фалклендскія (Мальвінскія) астравы"}
SZ{"Каралеўства Свазіленд"}
TL{"Усходні Тымор"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/bs.txt b/source/data/region/bs.txt
index 91191d2..4322d56 100644
--- a/source/data/region/bs.txt
+++ b/source/data/region/bs.txt
@@ -183,7 +183,7 @@
MF{"Sveti Martin"}
MG{"Madagaskar"}
MH{"Maršalova ostrva"}
- MK{"Makedonija"}
+ MK{"Sjeverna Makedonija"}
ML{"Mali"}
MM{"Mjanmar"}
MN{"Mongolija"}
@@ -305,9 +305,9 @@
CG{"Republika Kongo"}
CI{"Obala Bjelokosti"}
CZ{"Češka Republika"}
- MK{"Makedonija (BJR)"}
+ FK{"Folklandska (Malvinska) ostrva"}
SZ{"Svazi"}
TL{"TL"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/bs_Cyrl.txt b/source/data/region/bs_Cyrl.txt
index b3103bb..1b3ac29 100644
--- a/source/data/region/bs_Cyrl.txt
+++ b/source/data/region/bs_Cyrl.txt
@@ -183,7 +183,7 @@
MF{"Свети Мартин"}
MG{"Мадагаскар"}
MH{"Маршалска Острва"}
- MK{"Македонија"}
+ MK{"Сјеверна Македонија"}
ML{"Мали"}
MM{"Мјанмар"}
MN{"Монголија"}
@@ -303,7 +303,7 @@
CG{"Република Конго"}
CI{"Обала Бјелокости"}
CZ{"Чешка Република"}
- MK{"Македонија (БЈР)"}
+ FK{"Фокландска (Малвинска) острва"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ceb.txt b/source/data/region/ceb.txt
index 1f838b3..8db5370 100644
--- a/source/data/region/ceb.txt
+++ b/source/data/region/ceb.txt
@@ -10,10 +10,11 @@
IN{"India"}
IT{"Italya"}
JP{"Hapon"}
+ MK{"Amihanang Macedonia"}
PH{"Pilipinas"}
RU{"Russia"}
US{"Estados Unidos"}
ZZ{"Wala-mailhing Rehiyon"}
}
- Version{"2.1.49.33"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/chr.txt b/source/data/region/chr.txt
index c513068..60434c3 100644
--- a/source/data/region/chr.txt
+++ b/source/data/region/chr.txt
@@ -183,7 +183,7 @@
MF{"ᎤᏓᏅᏘ ᏡᏡ"}
MG{"ᎹᏓᎦᏍᎧᎵ"}
MH{"ᎹᏌᎵ ᏚᎦᏚᏛᎢ"}
- MK{"ᎹᏎᏙᏂᏯ"}
+ MK{"ᏧᏴᏜ ᎹᏎᏙᏂᏯ"}
ML{"ᎹᎵ"}
MM{"ᎹᏯᎹᎵ (ᏇᎵᎹ)"}
MN{"ᎹᏂᎪᎵᎠ"}
@@ -306,9 +306,9 @@
CG{"ᎧᏂᎪ (ᏍᎦᏚᎩ)"}
CI{"ᎤᏁᎬ ᎪᎳ ᎠᎹᏳᎶᏗ"}
CZ{"ᏤᎩ ᏍᎦᏚᎩ"}
- MK{"ᎹᏎᏙᏂᏯ (FYROM)"}
+ FK{"ᏩᎩ ᏚᎦᏚᏛᎢ (ᎢᏍᎳᏍ ᎹᎸᏫᎾᏍ)"}
SZ{"ᎠᏂᏍᏩᏏᎢ"}
TL{"ᏗᎧᎸᎬᎢ ᏘᎼᎵ"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/cy.txt b/source/data/region/cy.txt
index 7f9f7ed..55c5127 100644
--- a/source/data/region/cy.txt
+++ b/source/data/region/cy.txt
@@ -183,7 +183,7 @@
MF{"Saint Martin"}
MG{"Madagascar"}
MH{"Ynysoedd Marshall"}
- MK{"Macedonia"}
+ MK{"Gogledd Macedonia"}
ML{"Mali"}
MM{"Myanmar (Burma)"}
MN{"Mongolia"}
@@ -307,9 +307,9 @@
CG{"Y Congo (Gweriniaeth)"}
CI{"Arfordir Ifori"}
CZ{"Gweriniaeth Tsiec"}
- MK{"Macedonia (CWIM)"}
+ FK{"Ynysoedd y Falkland (Ynysoedd y Malfinas)"}
SZ{"Gwlad Swazi"}
TL{"Dwyrain Timor"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/da.txt b/source/data/region/da.txt
index 84ef6ff..7732a61 100644
--- a/source/data/region/da.txt
+++ b/source/data/region/da.txt
@@ -183,7 +183,7 @@
MF{"Saint Martin"}
MG{"Madagaskar"}
MH{"Marshalløerne"}
- MK{"Makedonien"}
+ MK{"Nordmakedonien"}
ML{"Mali"}
MM{"Myanmar (Burma)"}
MN{"Mongoliet"}
@@ -304,9 +304,9 @@
CD{"Den Demokratiske Republik Congo (DRC)"}
CG{"Republikken Congo"}
CZ{"Den Tjekkiske Republik"}
- MK{"Den tidligere jugoslaviske republik Makedonien"}
+ FK{"Falklandsøerne (Islas Malvinas)"}
SZ{"Swaziland"}
TL{"Østtimor"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/el.txt b/source/data/region/el.txt
index 05bd4f7..024d85f 100644
--- a/source/data/region/el.txt
+++ b/source/data/region/el.txt
@@ -308,5 +308,5 @@
CZ{"Τσεχική Δημοκρατία"}
TL{"Ανατολικό Τιμόρ"}
}
- Version{"2.1.49.26"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/es.txt b/source/data/region/es.txt
index 4eacfbe..e2f194f 100644
--- a/source/data/region/es.txt
+++ b/source/data/region/es.txt
@@ -183,7 +183,7 @@
MF{"San Martín"}
MG{"Madagascar"}
MH{"Islas Marshall"}
- MK{"Macedonia"}
+ MK{"Macedonia del Norte"}
ML{"Mali"}
MM{"Myanmar (Birmania)"}
MN{"Mongolia"}
@@ -304,9 +304,9 @@
CG{"Congo (República)"}
CI{"Costa de Marfil"}
CZ{"República Checa"}
- MK{"Macedonia (ERYM)"}
+ FK{"Islas Malvinas (Islas Falkland)"}
SZ{"Suazilandia"}
TL{"Timor Oriental"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/eu.txt b/source/data/region/eu.txt
index 879bca7..d4d85bd 100644
--- a/source/data/region/eu.txt
+++ b/source/data/region/eu.txt
@@ -183,7 +183,7 @@
MF{"San Martin"}
MG{"Madagaskar"}
MH{"Marshall Uharteak"}
- MK{"Mazedonia"}
+ MK{"Ipar Mazedonia"}
ML{"Mali"}
MM{"Myanmar (Birmania)"}
MN{"Mongolia"}
@@ -304,8 +304,8 @@
CG{"Kongoko Errepublika"}
CI{"CI"}
CZ{"Txekiar Errepublika"}
- MK{"Mazedoniako Jugoslaviar Errepublika Ohia"}
+ FK{"Falklandak (Malvinak)"}
TL{"TL"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/fa.txt b/source/data/region/fa.txt
index a5aec03..cdbdb56 100644
--- a/source/data/region/fa.txt
+++ b/source/data/region/fa.txt
@@ -308,5 +308,5 @@
SZ{"سوازیلند"}
TL{"تیمور شرقی"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/fil.txt b/source/data/region/fil.txt
index 9accbbc..8b0e615 100644
--- a/source/data/region/fil.txt
+++ b/source/data/region/fil.txt
@@ -183,7 +183,7 @@
MF{"Saint Martin"}
MG{"Madagascar"}
MH{"Marshall Islands"}
- MK{"Macedonia"}
+ MK{"North Macedonia"}
ML{"Mali"}
MM{"Myanmar (Burma)"}
MN{"Mongolia"}
@@ -307,8 +307,8 @@
CG{"Congo (Republika)"}
CI{"Ivory Coast"}
CZ{"Czech Republic"}
- MK{"Macedonia (FYROM)"}
+ FK{"Falkland Islands (Islas Malvinas)"}
TL{"East Timor"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/fr.txt b/source/data/region/fr.txt
index c9c912f..035fc8c 100644
--- a/source/data/region/fr.txt
+++ b/source/data/region/fr.txt
@@ -183,7 +183,7 @@
MF{"Saint-Martin"}
MG{"Madagascar"}
MH{"Îles Marshall"}
- MK{"Macédoine"}
+ MK{"Macédoine du Nord"}
ML{"Mali"}
MM{"Myanmar (Birmanie)"}
MN{"Mongolie"}
@@ -307,9 +307,9 @@
CG{"République du Congo"}
CI{"République de Côte d’Ivoire"}
CZ{"République tchèque"}
- MK{"Macédoine (ARYM)"}
+ FK{"Îles Falkland"}
SZ{"Swaziland"}
TL{"Timor-Oriental"}
}
- Version{"2.1.48.43"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ga.txt b/source/data/region/ga.txt
index e856b8e..da20a56 100644
--- a/source/data/region/ga.txt
+++ b/source/data/region/ga.txt
@@ -183,7 +183,7 @@
MF{"Saint-Martin"}
MG{"Madagascar"}
MH{"Oileáin Marshall"}
- MK{"an Mhacadóin"}
+ MK{"an Mhacadóin Thuaidh"}
ML{"Mailí"}
MM{"Maenmar (Burma)"}
MN{"an Mhongóil"}
@@ -307,9 +307,9 @@
CG{"an Congó (Poblacht)"}
CI{"Côte d’Ivoire"}
CZ{"Poblacht na Seice"}
- MK{"an Mhacadóin (PIIM)"}
+ FK{"Oileáin Fháclainne (Islas Malvinas)"}
SZ{"Ríocht na Suasalainne"}
TL{"TL"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/gd.txt b/source/data/region/gd.txt
index 962be49..7b74fed 100644
--- a/source/data/region/gd.txt
+++ b/source/data/region/gd.txt
@@ -183,7 +183,7 @@
MF{"Naomh Màrtainn"}
MG{"Madagasgar"}
MH{"Eileanan Mharshall"}
- MK{"A’ Mhasadon"}
+ MK{"A’ Mhasadon a Tuath"}
ML{"Màili"}
MM{"Miànmar"}
MN{"Dùthaich nam Mongol"}
@@ -304,8 +304,8 @@
CG{"A’ Chongo"}
CI{"An Costa Ìbhri"}
CZ{"Poblachd na Seice"}
- MK{"A’ Mhasadon (FYROM)"}
+ FK{"Na h-Eileanan Fàclannach (Islas Malvinas)"}
TL{"Tìomor an Ear"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/gl.txt b/source/data/region/gl.txt
index 64f46ac..248e63e 100644
--- a/source/data/region/gl.txt
+++ b/source/data/region/gl.txt
@@ -183,7 +183,7 @@
MF{"Saint Martin"}
MG{"Madagascar"}
MH{"Illas Marshall"}
- MK{"Macedonia"}
+ MK{"Macedonia do Norte"}
ML{"Malí"}
MM{"Myanmar (Birmania)"}
MN{"Mongolia"}
@@ -305,9 +305,9 @@
CG{"Congo (RC)"}
CI{"CI"}
CZ{"República Checa"}
- MK{"Macedonia (ARIM)"}
+ FK{"Illas Malvinas (Falkland)"}
SZ{"Suacilandia"}
TL{"TL"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/hi.txt b/source/data/region/hi.txt
index 755d91f..333f108 100644
--- a/source/data/region/hi.txt
+++ b/source/data/region/hi.txt
@@ -309,5 +309,5 @@
SZ{"स्वाज़िलैंड"}
TL{"पूर्वी तिमोर"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/hy.txt b/source/data/region/hy.txt
index d8b714e..9559523 100644
--- a/source/data/region/hy.txt
+++ b/source/data/region/hy.txt
@@ -183,7 +183,7 @@
MF{"Սեն Մարտեն"}
MG{"Մադագասկար"}
MH{"Մարշալյան կղզիներ"}
- MK{"Մակեդոնիա"}
+ MK{"Հյուսիսային Մակեդոնիա"}
ML{"Մալի"}
MM{"Մյանմա (Բիրմա)"}
MN{"Մոնղոլիա"}
@@ -305,9 +305,9 @@
CG{"Կոնգո (Կոնգոյի Հանրապետություն)"}
CI{"Փղոսկրի Ափ"}
CZ{"Չեխիայի Հանրապետություն"}
- MK{"Մակեդոնիա (ՄՆՀՀ)"}
+ FK{"Ֆոլքլենդյան (Մալվինյան) կղզիներ"}
SZ{"Սվազիլենդ"}
TL{"Արևելյան Թիմոր"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/is.txt b/source/data/region/is.txt
index 2e82eb1..bddb311 100644
--- a/source/data/region/is.txt
+++ b/source/data/region/is.txt
@@ -183,7 +183,7 @@
MF{"St. Martin"}
MG{"Madagaskar"}
MH{"Marshalleyjar"}
- MK{"Makedónía"}
+ MK{"Norður-Makedónía"}
ML{"Malí"}
MM{"Mjanmar (Búrma)"}
MN{"Mongólía"}
@@ -297,14 +297,17 @@
}
Countries%short{
GB{"Bretland"}
+ HK{"Hong Kong"}
+ MO{"Makaó"}
+ PS{"Palestína"}
UN{"SÞ"}
US{"BNA"}
}
Countries%variant{
CD{"Kongó (Lýðstjórnarlýðveldið)"}
CG{"Kongó (Lýðveldið)"}
- MK{"Makedónía (Fyrrverandi lýðveldi Júgóslavíu)"}
+ FK{"Falklandseyjar (Malvinas)"}
TL{"Austur-Tímor"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ja.txt b/source/data/region/ja.txt
index f64143a..1b21655 100644
--- a/source/data/region/ja.txt
+++ b/source/data/region/ja.txt
@@ -308,5 +308,5 @@
SZ{"スワジランド"}
TL{"東チモール"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/kk.txt b/source/data/region/kk.txt
index 7e538c1..4e2f4a8 100644
--- a/source/data/region/kk.txt
+++ b/source/data/region/kk.txt
@@ -183,7 +183,7 @@
MF{"Сен-Мартен"}
MG{"Мадагаскар"}
MH{"Маршалл аралдары"}
- MK{"Македония"}
+ MK{"Солтүстік Македония"}
ML{"Мали"}
MM{"Мьянма (Бирма)"}
MN{"Моңғолия"}
@@ -306,8 +306,8 @@
CD{"Конго Демократиялық Республикасы"}
CG{"Конго Республикасы"}
CZ{"Чех Республикасы"}
- MK{"Македония Республикасы"}
+ FK{"Фолкленд аралдары (Мальвин аралдары)"}
TL{"Шығыс Тимор"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/km.txt b/source/data/region/km.txt
index 5c7d9a9..9dc7f6e 100644
--- a/source/data/region/km.txt
+++ b/source/data/region/km.txt
@@ -183,7 +183,7 @@
MF{"សាំងម៉ាទីន"}
MG{"ម៉ាដាហ្គាស្កា"}
MH{"កោះម៉ាស់សល"}
- MK{"ម៉ាសេដ្វាន"}
+ MK{"ម៉ាសេដ្វានខាងជើង"}
ML{"ម៉ាលី"}
MM{"មីយ៉ាន់ម៉ា (ភូមា)"}
MN{"ម៉ុងហ្គោលី"}
@@ -305,8 +305,8 @@
CG{"កុងហ្គោ (សធារណរដ្ឋ)"}
CI{"អាយវ៉ូរី ខូសថ៍"}
CZ{"សាធារណរដ្ឋឆេក"}
- MK{"ម៉ាសេដ្វាន (អតីតសាធារណរដ្ឋយូហ្គោស្លាវី)"}
+ FK{"កោះហ្វក់ឡែន (Islas Malvinas)"}
TL{"ទីម័រខាងកើត"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ko.txt b/source/data/region/ko.txt
index 56f5e21..ed3b9d2 100644
--- a/source/data/region/ko.txt
+++ b/source/data/region/ko.txt
@@ -183,7 +183,7 @@
MF{"생마르탱"}
MG{"마다가스카르"}
MH{"마셜 제도"}
- MK{"마케도니아"}
+ MK{"북마케도니아"}
ML{"말리"}
MM{"미얀마"}
MN{"몽골"}
@@ -307,9 +307,9 @@
CG{"콩고 공화국"}
CI{"아이보리 코스트"}
CZ{"체코 공화국"}
- MK{"마케도니아(FYROM)"}
+ FK{"포클랜드 제도(말비나스 군도)"}
SZ{"스와질란드"}
TL{"티모르레스테"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/kok.txt b/source/data/region/kok.txt
index ea5eca8..ea59984 100644
--- a/source/data/region/kok.txt
+++ b/source/data/region/kok.txt
@@ -183,7 +183,7 @@
MF{"सॅंट मार्टिन"}
MG{"माडागास्कर"}
MH{"मार्शल आयलँड्स"}
- MK{"मॅसिडोनिया"}
+ MK{"उत्तर मॅसिडोनिया"}
ML{"माली"}
MM{"म्यानमार (बर्मा)"}
MN{"मंगोलिया"}
@@ -304,8 +304,8 @@
CG{"कोंगो (प्रजासत्ताक)"}
CI{"आयवोरी कोस्ट"}
CZ{"चेक लोकसत्ताक"}
- MK{"मॅसिडोनिया (FYROM)"}
+ FK{"फ़ॉकलैंड आइलैंड्स (इलास मालविनास)"}
TL{"ईस्ट तिमूर"}
}
- Version{"2.1.48.4"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ky.txt b/source/data/region/ky.txt
index 77dedb4..7f4c7a4 100644
--- a/source/data/region/ky.txt
+++ b/source/data/region/ky.txt
@@ -183,7 +183,7 @@
MF{"Сент-Мартин"}
MG{"Мадагаскар"}
MH{"Маршалл аралдары"}
- MK{"Македония"}
+ MK{"Түндүк Македония"}
ML{"Мали"}
MM{"Мьянма (Бирма)"}
MN{"Монголия"}
@@ -304,9 +304,9 @@
CG{"Конго (Республикасы)"}
CI{"Пил сөөктүү жээк"}
CZ{"Чех Республикасы"}
- MK{"Македония (Мур. Югосл.)"}
+ FK{"Фолкленд (Мальвина) аралдары"}
SZ{"SZ"}
TL{"Чыгыш Тимор"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/lb.txt b/source/data/region/lb.txt
index ef91944..997c82d 100644
--- a/source/data/region/lb.txt
+++ b/source/data/region/lb.txt
@@ -181,7 +181,7 @@
MF{"St. Martin"}
MG{"Madagaskar"}
MH{"Marshallinselen"}
- MK{"Mazedonien"}
+ MK{"Nordmazedonien"}
ML{"Mali"}
MM{"Myanmar"}
MN{"Mongolei"}
@@ -300,7 +300,6 @@
CD{"Kongo (Demokratesch Republik)"}
CG{"Kongo (Republik)"}
CI{"Elfebeeküst"}
- MK{"Mazedonien (EJR)"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/mi.txt b/source/data/region/mi.txt
index 34bc6df..5cea79f 100644
--- a/source/data/region/mi.txt
+++ b/source/data/region/mi.txt
@@ -10,10 +10,11 @@
IN{"Inia"}
IT{"Itāria"}
JP{"Hapani"}
+ MK{"Makerōnia ki te Raki"}
NZ{"Aotearoa"}
RU{"Rūhia"}
US{"Hononga o Amerika"}
ZZ{"Rohe Tē Mōhiotia"}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/mt.txt b/source/data/region/mt.txt
index 5f1cc7b..2b7e301 100644
--- a/source/data/region/mt.txt
+++ b/source/data/region/mt.txt
@@ -179,7 +179,7 @@
MF{"Saint Martin"}
MG{"Madagascar"}
MH{"Gżejjer Marshall"}
- MK{"l-Eks-Repubblika Jugoslava tal-Maċedonia"}
+ MK{"il-Maċedonja ta’ Fuq"}
ML{"il-Mali"}
MM{"il-Myanmar/Burma"}
MN{"il-Mongolja"}
@@ -291,14 +291,17 @@
}
Countries%short{
GB{"UK"}
+ HK{"Hong Kong"}
+ MO{"il-Macao"}
+ PS{"il-Palestina"}
US{"US"}
}
Countries%variant{
CD{"Kongo (RDK)"}
CG{"ir-Repubblika tal-Kongo"}
CZ{"Ir-Repubblika Ċeka"}
- MK{"l-Eks Repubblika Jugoslava tal-Maċedonia"}
+ FK{"Il-Gżejjer Falkland (il-Gżejjer Malvinas)"}
TL{"Timor tal-Lvant"}
}
- Version{"2.1.47.72"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/my.txt b/source/data/region/my.txt
index de8aa7b..143e8ae 100644
--- a/source/data/region/my.txt
+++ b/source/data/region/my.txt
@@ -183,7 +183,7 @@
MF{"စိန့်မာတင်"}
MG{"မဒါဂတ်စကား"}
MH{"မာရှယ် ကျွန်းစု"}
- MK{"မက်ဆီဒိုးနီးယား"}
+ MK{"မြောက် မက်ဆီဒိုးနီးယား"}
ML{"မာလီ"}
MM{"မြန်မာ"}
MN{"မွန်ဂိုးလီးယား"}
@@ -305,7 +305,7 @@
CG{"ကွန်ဂို သမ္မတနိုင်ငံ"}
CI{"အိုင်ဗရီကို့စ်"}
CZ{"ချက် ပြည်ထောင်စု"}
- MK{"မက်ဆီဒိုးနီးယား (ယခင် ယူဂိုစလားဗီးယား မက်ဆီဒိုးနီးယားပြည်ထောင်စု)"}
+ FK{"ဖော့ကလန် ကျွန်းစု (အီလားစ် မောလ်ဗီနာစ်)"}
}
- Version{"2.1.48.36"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ne.txt b/source/data/region/ne.txt
index 686e544..3ecaf27 100644
--- a/source/data/region/ne.txt
+++ b/source/data/region/ne.txt
@@ -183,7 +183,7 @@
MF{"सेन्ट मार्टिन"}
MG{"माडागास्कर"}
MH{"मार्शल टापुहरु"}
- MK{"म्यासेडोनिया"}
+ MK{"उत्तर म्यासेडोनिया"}
ML{"माली"}
MM{"म्यान्मार (बर्मा)"}
MN{"मङ्गोलिया"}
@@ -304,9 +304,9 @@
CG{"कङ्गो (गणतन्त्र)"}
CI{"आइभोरी कोस्ट"}
CZ{"चेक गणतन्त्र"}
- MK{"म्यासेडोनिया (फाइरम)"}
+ FK{"फक्ल्याण्ड टापुहरू (इज्लास माल्भिनास)"}
SZ{"SZ"}
TL{"पृर्वी टीमोर"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/nl.txt b/source/data/region/nl.txt
index 987fe6f..028a307 100644
--- a/source/data/region/nl.txt
+++ b/source/data/region/nl.txt
@@ -310,5 +310,5 @@
SZ{"Swaziland"}
TL{"Democratische Republiek Oost-Timor"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/nn.txt b/source/data/region/nn.txt
index ec25672..2d4d43e 100644
--- a/source/data/region/nn.txt
+++ b/source/data/region/nn.txt
@@ -182,7 +182,7 @@
MF{"Saint Martin"}
MG{"Madagaskar"}
MH{"Marshalløyane"}
- MK{"Makedonia"}
+ MK{"Nord-Makedonia"}
ML{"Mali"}
MM{"Myanmar (Burma)"}
MN{"Mongolia"}
@@ -296,13 +296,16 @@
}
Countries%short{
GB{"Storbritannia"}
+ HK{"Hongkong"}
+ MO{"Macao"}
+ PS{"Palestina"}
US{"USA"}
}
Countries%variant{
CD{"Den demokratiske republikken Kongo"}
CG{"Republikken Kongo"}
- MK{"Den tidlegare jugoslaviske republikken Makedonia"}
+ FK{"Falklandsøyane (Islas Malvinas)"}
TL{"Aust-Timor"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/or.txt b/source/data/region/or.txt
index 03e8f5b..56cb958 100644
--- a/source/data/region/or.txt
+++ b/source/data/region/or.txt
@@ -183,7 +183,7 @@
MF{"ସେଣ୍ଟ ମାର୍ଟିନ୍"}
MG{"ମାଡାଗାସ୍କର୍"}
MH{"ମାର୍ଶାଲ୍ ଦ୍ୱୀପପୁଞ୍ଜ"}
- MK{"ମାସେଡୋନିଆ"}
+ MK{"ଉତ୍ତର ମାସେଡୋନିଆ"}
ML{"ମାଲି"}
MM{"ମିଆଁମାର"}
MN{"ମଙ୍ଗୋଲିଆ"}
@@ -306,9 +306,9 @@
CG{"କଙ୍ଗୋ (ସାଧାରଣତନ୍ତ୍ର)"}
CI{"ଆଇଭରୀ କୋଷ୍ଟ"}
CZ{"ଚେକ୍ ସାଧାରଣତନ୍ତ୍ର"}
- MK{"ମାସେଡୋନିଆ (ଏଫ୍ୱାଇଆର୍ଓଏମ୍)"}
+ FK{"ଫକଲ୍ୟାଣ୍ଡ ଦ୍ୱୀପପୁଞ୍ଜ (ଇସଲାସ୍ ମାଲଭିନାସ୍)"}
SZ{"ସ୍ୱାଜିଲ୍ୟାଣ୍ଡ"}
TL{"ପୂର୍ବ ତିମୋର୍"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ps.txt b/source/data/region/ps.txt
index fa4dc5d..ec0edbd 100644
--- a/source/data/region/ps.txt
+++ b/source/data/region/ps.txt
@@ -183,7 +183,7 @@
MF{"سینټ مارټن"}
MG{"مدګاسکار"}
MH{"مارشل ټاپوګان"}
- MK{"مقدونیه"}
+ MK{"شمالي مقدونيه"}
ML{"مالي"}
MM{"ميانمار (برما)"}
MN{"مغولستان"}
@@ -306,9 +306,9 @@
CG{"کانګو (جمهوریه)"}
CI{"ایوري ساحل"}
CZ{"جمهوريه چيک"}
- MK{"مقدونیه (FYROM)"}
+ FK{"فاکلينډ ټاپوګان (آيزلز مالويناس)"}
SZ{"سوازيلېنډ"}
TL{"ختيځ تيمور"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/pt_PT.txt b/source/data/region/pt_PT.txt
index 330ae4c..971a62b 100644
--- a/source/data/region/pt_PT.txt
+++ b/source/data/region/pt_PT.txt
@@ -46,7 +46,7 @@
MC{"Mónaco"}
MD{"Moldávia"}
MG{"Madagáscar"}
- MK{"Macedónia"}
+ MK{"Macedónia do Norte"}
MS{"Monserrate"}
MU{"Maurícia"}
MW{"Maláui"}
@@ -80,7 +80,7 @@
CG{"República do Congo"}
CI{"Costa do Marfim"}
CZ{"República Checa"}
- MK{"Macedónia (ARJM)"}
+ FK{"Ilhas Falkland (Malvinas)"}
}
- Version{"2.1.47.89"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/qu.txt b/source/data/region/qu.txt
index a5d5ac0..55cf0f9 100644
--- a/source/data/region/qu.txt
+++ b/source/data/region/qu.txt
@@ -106,7 +106,7 @@
MF{"San Martín"}
MG{"Madagascar"}
MH{"Islas Marshall"}
- MK{"ERY Macedonia"}
+ MK{"Macedonia del Norte"}
ML{"Malí"}
MM{"Myanmar"}
MO{"Macao RAE"}
@@ -193,5 +193,5 @@
ZM{"Zambia"}
ZW{"Zimbabue"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ro.txt b/source/data/region/ro.txt
index 06805bf..80246f0 100644
--- a/source/data/region/ro.txt
+++ b/source/data/region/ro.txt
@@ -183,7 +183,7 @@
MF{"Sfântul Martin"}
MG{"Madagascar"}
MH{"Insulele Marshall"}
- MK{"Republica Macedonia"}
+ MK{"Macedonia de Nord"}
ML{"Mali"}
MM{"Myanmar (Birmania)"}
MN{"Mongolia"}
@@ -307,9 +307,9 @@
CG{"Congo (Republica)"}
CI{"Coasta de Fildeș"}
CZ{"Republica Cehă"}
- MK{"Republica Macedonia (FRIM)"}
+ FK{"Insulele Falkland (Insulele Malvine)"}
SZ{"Swaziland"}
TL{"Timorul de Est"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/root.txt b/source/data/region/root.txt
index 2ac4063..4bc27db 100644
--- a/source/data/region/root.txt
+++ b/source/data/region/root.txt
@@ -4,5 +4,5 @@
* ICU <specials> source: <path>/common/main/root.xml
*/
root{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ru.txt b/source/data/region/ru.txt
index 3f2af98..3178441 100644
--- a/source/data/region/ru.txt
+++ b/source/data/region/ru.txt
@@ -310,5 +310,5 @@
SZ{"Свазиленд"}
TL{"Тимор-Лесте"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/rw.txt b/source/data/region/rw.txt
index 7cb9275..a17494c 100644
--- a/source/data/region/rw.txt
+++ b/source/data/region/rw.txt
@@ -2,8 +2,9 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
rw{
Countries{
+ MK{"Masedoniya y'Amajyaruguru"}
RW{"U Rwanda"}
TO{"Tonga"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/sd.txt b/source/data/region/sd.txt
index 1ac2617..d0e167c 100644
--- a/source/data/region/sd.txt
+++ b/source/data/region/sd.txt
@@ -310,5 +310,5 @@
SZ{"سوازيلينڊ"}
TL{"اوڀر تيمور"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/so.txt b/source/data/region/so.txt
index ab311bf..2c6596b 100644
--- a/source/data/region/so.txt
+++ b/source/data/region/so.txt
@@ -183,7 +183,7 @@
MF{"St. Maartin"}
MG{"Madagaskar"}
MH{"Jasiiradda Maarshal"}
- MK{"Masedooniya"}
+ MK{"Masedooniya Waqooyi"}
ML{"Maali"}
MM{"Miyanmar"}
MN{"Mongooliya"}
@@ -306,9 +306,9 @@
CG{"Jamhuuriyadda Kongo"}
CI{"Aayforikoost"}
CZ{"Jamhuuriyadda Jek"}
- MK{"Masedooniya (FYROM)"}
+ FK{"Jasiiradaha Fookland"}
SZ{"Iswaasilaan"}
TL{"Timoor Bari"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/sr.txt b/source/data/region/sr.txt
index 4d055a4..d194c7f 100644
--- a/source/data/region/sr.txt
+++ b/source/data/region/sr.txt
@@ -309,5 +309,5 @@
CZ{"Чешка Република"}
TL{"Источни Тимор"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/sr_Latn.txt b/source/data/region/sr_Latn.txt
index 034e4e4..285acf3 100644
--- a/source/data/region/sr_Latn.txt
+++ b/source/data/region/sr_Latn.txt
@@ -310,5 +310,5 @@
CZ{"Češka Republika"}
TL{"Istočni Timor"}
}
- Version{"2.1.48.77"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/tg.txt b/source/data/region/tg.txt
index 2f9f593..03a62ce 100644
--- a/source/data/region/tg.txt
+++ b/source/data/region/tg.txt
@@ -141,7 +141,7 @@
MF{"Ҷазираи Сент-Мартин"}
MG{"Мадагаскар"}
MH{"Ҷазираҳои Маршалл"}
- MK{"Мақдун"}
+ MK{"Македонияи Шимолӣ"}
ML{"Мали"}
MM{"Мянма"}
MN{"Муғулистон"}
@@ -256,7 +256,6 @@
Countries%variant{
CD{"Конго (ҶДК)"}
CG{"Конго"}
- MK{"Мақдун (ҶСЮМ)"}
}
- Version{"2.1.47.96"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/th.txt b/source/data/region/th.txt
index 24d7c11..a724731 100644
--- a/source/data/region/th.txt
+++ b/source/data/region/th.txt
@@ -308,5 +308,5 @@
SZ{"สวาซิแลนด์"}
TL{"ติมอร์ตะวันออก"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ti.txt b/source/data/region/ti.txt
index 2b70880..fbbe89c 100644
--- a/source/data/region/ti.txt
+++ b/source/data/region/ti.txt
@@ -150,7 +150,7 @@
MF{"ሴንት ማርቲን"}
MG{"ማዳጋስካር"}
MH{"ማርሻል አይላንድ"}
- MK{"ማከዶኒያ"}
+ MK{"ሰሜን መቆዶንያ"}
ML{"ማሊ"}
MM{"ማያንማር"}
MN{"ሞንጎሊያ"}
@@ -266,7 +266,6 @@
Countries%variant{
CI{"አይቮሪ ኮስት"}
CZ{"CZ"}
- MK{"መቄዶኒያ"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/tk.txt b/source/data/region/tk.txt
index 715656c..a92f250 100644
--- a/source/data/region/tk.txt
+++ b/source/data/region/tk.txt
@@ -183,7 +183,7 @@
MF{"Sen-Marten"}
MG{"Madagaskar"}
MH{"Marşall adalary"}
- MK{"Makedoniýa"}
+ MK{"Demirgazyk Makedoniýa"}
ML{"Mali"}
MM{"Mýanma (Burma)"}
MN{"Mongoliýa"}
@@ -306,8 +306,8 @@
CG{"Kongo (Respublika)"}
CI{"Şirmaýy kenar"}
CZ{"Çeh Respublikasy"}
- MK{"Makedoniýa (ÖÝR)"}
+ FK{"Folklend (Malwina) adalary"}
TL{"Gündogar Timor"}
}
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/tt.txt b/source/data/region/tt.txt
index 2933362..30cd1ee 100644
--- a/source/data/region/tt.txt
+++ b/source/data/region/tt.txt
@@ -140,6 +140,7 @@
MF{"Сент-Мартин"}
MG{"Мадагаскар"}
MH{"Маршалл утраулары"}
+ MK{"Төньяк Македония"}
ML{"Мали"}
MN{"Монголия"}
MO{"Макао"}
@@ -246,7 +247,6 @@
}
Countries%variant{
CD{"Конго (КДР)"}
- MK{"Македония (Македония Элекке Югославия Республикасы)"}
}
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ug.txt b/source/data/region/ug.txt
index 3b82dc6..7658758 100644
--- a/source/data/region/ug.txt
+++ b/source/data/region/ug.txt
@@ -181,7 +181,7 @@
MF{"ساينت مارتىن"}
MG{"ماداغاسقار"}
MH{"مارشال ئاراللىرى"}
- MK{"ماكېدونىيە"}
+ MK{"شىمالىي ماكېدونىيە"}
ML{"مالى"}
MM{"بىرما"}
MN{"موڭغۇلىيە"}
@@ -294,13 +294,16 @@
}
Countries%short{
GB{"ئەنگلىيە"}
+ HK{"شياڭگاڭ"}
+ MO{"ئاۋمېن"}
+ PS{"پەلەستىن"}
US{"ئا ق ش"}
}
Countries%variant{
CD{"كونگو (ك د ج)"}
CG{"كونگو (جۇمھۇرىيىتى)"}
CI{"پىل چىشى قىرغىقى"}
- MK{"ماكېدونىيە (سابىق يۇگوسلاۋىيە ماكېدونىيە جۇمھۇرىيىتى)"}
+ FK{"فالكلاند ئاراللىرى (ئىسلاس مالۋىناس)"}
}
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/uk.txt b/source/data/region/uk.txt
index 59c2611..015074c 100644
--- a/source/data/region/uk.txt
+++ b/source/data/region/uk.txt
@@ -311,5 +311,5 @@
SZ{"Свазіленд"}
TL{"Східний Тимор"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/ur.txt b/source/data/region/ur.txt
index 8dda7f2..97fa457 100644
--- a/source/data/region/ur.txt
+++ b/source/data/region/ur.txt
@@ -183,7 +183,7 @@
MF{"سینٹ مارٹن"}
MG{"مڈغاسکر"}
MH{"مارشل آئلینڈز"}
- MK{"مقدونیہ"}
+ MK{"شمالی مقدونیہ"}
ML{"مالی"}
MM{"میانمار (برما)"}
MN{"منگولیا"}
@@ -307,9 +307,9 @@
CG{"کانگو (جمہوریہ)"}
CI{"آئیوری کوسٹ"}
CZ{"چیک جمہوریہ"}
- MK{"مقدونیہ (FYROM)"}
+ FK{"فاکلینڈ جزائر (مالویناس)"}
SZ{"سوازی لینڈ"}
TL{"مشرقی تیمور"}
}
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/uz.txt b/source/data/region/uz.txt
index 00f0f4b..c142ad3 100644
--- a/source/data/region/uz.txt
+++ b/source/data/region/uz.txt
@@ -183,7 +183,7 @@
MF{"Sent-Martin"}
MG{"Madagaskar"}
MH{"Marshall orollari"}
- MK{"Makedoniya"}
+ MK{"Shimoliy Makedoniya"}
ML{"Mali"}
MM{"Myanma (Birma)"}
MN{"Mongoliya"}
@@ -305,8 +305,8 @@
CG{"Kongo (Respublika)"}
CI{"Fil suyagi qirg‘og‘i"}
CZ{"Chexiya Respublikasi"}
- MK{"Makedoniya (SYRM)"}
+ FK{"Folklend (Malvin) orollari"}
TL{"Sharqiy Timor"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/uz_Cyrl.txt b/source/data/region/uz_Cyrl.txt
index 292bcaa..c449f85 100644
--- a/source/data/region/uz_Cyrl.txt
+++ b/source/data/region/uz_Cyrl.txt
@@ -182,7 +182,7 @@
MF{"Сент-Мартин"}
MG{"Мадагаскар"}
MH{"Маршал ороллари"}
- MK{"Македония"}
+ MK{"Шимолий Македония"}
ML{"Мали"}
MM{"Мьянма (Бирма)"}
MN{"Монголия"}
@@ -302,8 +302,8 @@
CG{"Конго (Республика)"}
CI{"Фил Суяги Қирғоғи"}
CZ{"Чехия Республикаси"}
- MK{"Македония (МСЮР)"}
+ FK{"Фолкленд (Малвин) ороллари"}
TL{"Шарқий Тимор"}
}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/vi.txt b/source/data/region/vi.txt
index f046d1b..b77fb64 100644
--- a/source/data/region/vi.txt
+++ b/source/data/region/vi.txt
@@ -309,5 +309,5 @@
CZ{"Cộng hòa Séc"}
TL{"Đông Timor"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/wo.txt b/source/data/region/wo.txt
index 9712802..237dab4 100644
--- a/source/data/region/wo.txt
+++ b/source/data/region/wo.txt
@@ -140,7 +140,7 @@
MF{"Saŋ Marteŋ"}
MG{"Madagaskaar"}
MH{"Duni Marsaal"}
- MK{"Maseduwaan"}
+ MK{"Maseduwaan bëj Gànnaar"}
ML{"Mali"}
MM{"Miyanmaar"}
MN{"Mongoli"}
@@ -251,7 +251,6 @@
Countries%variant{
CD{"Kongo (R K D)"}
CG{"Réewum Kongo"}
- MK{"Maseduwaan (Réewum yugoslawi gu yàgg ga)"}
}
- Version{"2.1.47.84"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/xh.txt b/source/data/region/xh.txt
index a1de769..dca7443 100644
--- a/source/data/region/xh.txt
+++ b/source/data/region/xh.txt
@@ -2,7 +2,8 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
xh{
Countries{
+ MK{"uMntla Macedonia"}
ZA{"eMzantsi Afrika"}
}
- Version{"2.1.48.89"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/yue.txt b/source/data/region/yue.txt
index a11e773..31f9019 100644
--- a/source/data/region/yue.txt
+++ b/source/data/region/yue.txt
@@ -305,5 +305,5 @@
CG{"剛果共和國"}
CZ{"捷克共和國"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/yue_Hans.txt b/source/data/region/yue_Hans.txt
index bd398b1..a327dcd 100644
--- a/source/data/region/yue_Hans.txt
+++ b/source/data/region/yue_Hans.txt
@@ -306,5 +306,5 @@
CG{"刚果共和国"}
CZ{"捷克共和国"}
}
- Version{"2.1.48.80"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/zh.txt b/source/data/region/zh.txt
index 039b7b7..f49ad69 100644
--- a/source/data/region/zh.txt
+++ b/source/data/region/zh.txt
@@ -309,5 +309,5 @@
CZ{"捷克共和国"}
TL{"TL"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/region/zh_Hant.txt b/source/data/region/zh_Hant.txt
index 9f38ec5..880b024 100644
--- a/source/data/region/zh_Hant.txt
+++ b/source/data/region/zh_Hant.txt
@@ -308,5 +308,5 @@
CG{"剛果共和國"}
CZ{"捷克共和國"}
}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/unidata/CaseFolding.txt b/source/data/unidata/CaseFolding.txt
index 47949f0..7eeb915 100644
--- a/source/data/unidata/CaseFolding.txt
+++ b/source/data/unidata/CaseFolding.txt
@@ -1,5 +1,5 @@
-# CaseFolding-12.0.0.txt
-# Date: 2019-01-22, 08:18:22 GMT
+# CaseFolding-12.1.0.txt
+# Date: 2019-03-10, 10:53:00 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/source/data/unidata/DerivedCoreProperties.txt b/source/data/unidata/DerivedCoreProperties.txt
index 04cd07e..7856f2b 100644
--- a/source/data/unidata/DerivedCoreProperties.txt
+++ b/source/data/unidata/DerivedCoreProperties.txt
@@ -1,5 +1,5 @@
-# DerivedCoreProperties-12.0.0.txt
-# Date: 2019-01-22, 08:18:27 GMT
+# DerivedCoreProperties-12.1.0.txt
+# Date: 2019-03-10, 10:53:06 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
@@ -11071,8 +11071,7 @@
3280..3289 ; Grapheme_Base
328A..32B0 ; Grapheme_Base
32B1..32BF ; Grapheme_Base
-32C0..32FE ; Grapheme_Base
-3300..33FF ; Grapheme_Base
+32C0..33FF ; Grapheme_Base
3400..4DB5 ; Grapheme_Base
4DC0..4DFF ; Grapheme_Base
4E00..9FEF ; Grapheme_Base
@@ -11819,7 +11818,7 @@
2CEB0..2EBE0 ; Grapheme_Base
2F800..2FA1D ; Grapheme_Base
-# Total code points: 135897
+# Total code points: 135898
# ================================================
diff --git a/source/data/unidata/DerivedNormalizationProps.txt b/source/data/unidata/DerivedNormalizationProps.txt
index 277c3ea..1c75ebd 100644
--- a/source/data/unidata/DerivedNormalizationProps.txt
+++ b/source/data/unidata/DerivedNormalizationProps.txt
@@ -1,5 +1,5 @@
-# DerivedNormalizationProps-12.0.0.txt
-# Date: 2019-01-22, 08:18:29 GMT
+# DerivedNormalizationProps-12.1.0.txt
+# Date: 2019-04-01, 09:10:23 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
@@ -1464,8 +1464,7 @@
3280..3289 ; NFKD_QC; N
328A..32B0 ; NFKD_QC; N
32B1..32BF ; NFKD_QC; N
-32C0..32FE ; NFKD_QC; N
-3300..33FF ; NFKD_QC; N
+32C0..33FF ; NFKD_QC; N
A69C..A69D ; NFKD_QC; N
A770 ; NFKD_QC; N
A7F8..A7F9 ; NFKD_QC; N
@@ -1686,7 +1685,7 @@
1F250..1F251 ; NFKD_QC; N
2F800..2FA1D ; NFKD_QC; N
-# Total code points: 16895
+# Total code points: 16896
# ================================================
@@ -1876,8 +1875,7 @@
3280..3289 ; NFKC_QC; N
328A..32B0 ; NFKC_QC; N
32B1..32BF ; NFKC_QC; N
-32C0..32FE ; NFKC_QC; N
-3300..33FF ; NFKC_QC; N
+32C0..33FF ; NFKC_QC; N
A69C..A69D ; NFKC_QC; N
A770 ; NFKC_QC; N
A7F8..A7F9 ; NFKC_QC; N
@@ -2089,7 +2087,7 @@
1F250..1F251 ; NFKC_QC; N
2F800..2FA1D ; NFKC_QC; N
-# Total code points: 4795
+# Total code points: 4796
# ================================================
@@ -2683,7 +2681,7 @@
326E..327E ; Expands_On_NFKD
32B1..32BF ; Expands_On_NFKD
32C0..32CF ; Expands_On_NFKD
-3300..33FF ; Expands_On_NFKD
+32FF..33FF ; Expands_On_NFKD
AC00..D7A3 ; Expands_On_NFKD
FB00..FB06 ; Expands_On_NFKD
FB13..FB17 ; Expands_On_NFKD
@@ -2733,7 +2731,7 @@
1F213 ; Expands_On_NFKD
1F240..1F248 ; Expands_On_NFKD
-# Total code points: 13388
+# Total code points: 13389
# ================================================
@@ -2834,7 +2832,7 @@
327C..327D ; Expands_On_NFKC
32B1..32BF ; Expands_On_NFKC
32C0..32CF ; Expands_On_NFKC
-3300..33FF ; Expands_On_NFKC
+32FF..33FF ; Expands_On_NFKC
FB00..FB06 ; Expands_On_NFKC
FB13..FB17 ; Expands_On_NFKC
FB1D ; Expands_On_NFKC
@@ -2871,7 +2869,7 @@
1F200..1F201 ; Expands_On_NFKC
1F240..1F248 ; Expands_On_NFKC
-# Total code points: 1236
+# Total code points: 1237
# ================================================
@@ -4959,6 +4957,7 @@
32FC ; NFKC_CF; 30F0
32FD ; NFKC_CF; 30F1
32FE ; NFKC_CF; 30F2
+32FF ; NFKC_CF; 4EE4 548C
3300 ; NFKC_CF; 30A2 30D1 30FC 30C8
3301 ; NFKC_CF; 30A2 30EB 30D5 30A1
3302 ; NFKC_CF; 30A2 30F3 30DA 30A2
@@ -8803,7 +8802,7 @@
E0100..E01EF ; NFKC_CF;
E01F0..E0FFF ; NFKC_CF;
-# Total code points: 10314
+# Total code points: 10315
# ================================================
@@ -9461,8 +9460,7 @@
3280..3289 ; Changes_When_NFKC_Casefolded
328A..32B0 ; Changes_When_NFKC_Casefolded
32B1..32BF ; Changes_When_NFKC_Casefolded
-32C0..32FE ; Changes_When_NFKC_Casefolded
-3300..33FF ; Changes_When_NFKC_Casefolded
+32C0..33FF ; Changes_When_NFKC_Casefolded
A640 ; Changes_When_NFKC_Casefolded
A642 ; Changes_When_NFKC_Casefolded
A644 ; Changes_When_NFKC_Casefolded
@@ -9798,6 +9796,6 @@
E0100..E01EF ; Changes_When_NFKC_Casefolded
E01F0..E0FFF ; Changes_When_NFKC_Casefolded
-# Total code points: 10314
+# Total code points: 10315
# EOF
diff --git a/source/data/unidata/FractionalUCA.txt b/source/data/unidata/FractionalUCA.txt
index aeff577..5655134 100644
--- a/source/data/unidata/FractionalUCA.txt
+++ b/source/data/unidata/FractionalUCA.txt
@@ -1,12 +1,12 @@
# Fractional UCA Table, generated from the UCA DUCET
-# 2019-02-14 [MS]
-# VERSION: UCA=12.0.0, UCD=12.0.0
+# 2019-04-01 [MS]
+# VERSION: UCA=12.1.0, UCD=12.1.0
# © 2016 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html
-[UCA version = 12.0.0]
+[UCA version = 12.1.0]
# Unified_Ideograph: 87887 characters
[Unified_Ideograph 4E00..9FEF FA0E..FA0F FA11 FA13..FA14 FA1F FA21 FA23..FA24 FA27..FA29 3400..4DB5 20000..2A6D6 2A700..2B734 2B740..2B81D 2B820..2CEA1 2CEB0..2EBE0]
@@ -61187,6 +61187,7 @@
F9FD; [U+4EC0]
2F819; [U+4ECC]
F9A8; [U+4EE4]
+32FF; [U+4EE4, 31][U+548C, 31]
32AD; [U+4F01, 1B]
32A1; [U+4F11, 1B]
2F804; [U+4F60]
diff --git a/source/data/unidata/NormalizationCorrections.txt b/source/data/unidata/NormalizationCorrections.txt
index 1f39b32..360f49c 100644
--- a/source/data/unidata/NormalizationCorrections.txt
+++ b/source/data/unidata/NormalizationCorrections.txt
@@ -1,6 +1,6 @@
-# NormalizationCorrections-12.0.0.txt
-# Date: 2018-08-03, 00:00:00 GMT [KW, LI]
-# © 2018 Unicode®, Inc.
+# NormalizationCorrections-12.1.0.txt
+# Date: 2019-03-08, 23:59:00 GMT [KW, LI]
+# © 2019 Unicode®, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# Unicode Character Database
diff --git a/source/data/unidata/NormalizationTest.txt b/source/data/unidata/NormalizationTest.txt
index b91cf78..cf4c3a9 100644
--- a/source/data/unidata/NormalizationTest.txt
+++ b/source/data/unidata/NormalizationTest.txt
@@ -1,5 +1,5 @@
-# NormalizationTest-12.0.0.txt
-# Date: 2019-01-22, 08:18:33 GMT
+# NormalizationTest-12.1.0.txt
+# Date: 2019-04-01, 09:10:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
@@ -2149,6 +2149,7 @@
32FC;32FC;32FC;30F0;30F0;
32FD;32FD;32FD;30F1;30F1;
32FE;32FE;32FE;30F2;30F2;
+32FF;32FF;32FF;4EE4 548C;4EE4 548C;
3300;3300;3300;30A2 30D1 30FC 30C8;30A2 30CF 309A 30FC 30C8;
3301;3301;3301;30A2 30EB 30D5 30A1;30A2 30EB 30D5 30A1;
3302;3302;3302;30A2 30F3 30DA 30A2;30A2 30F3 30D8 309A 30A2;
diff --git a/source/data/unidata/SpecialCasing.txt b/source/data/unidata/SpecialCasing.txt
index 7db2e31..1c04aac 100644
--- a/source/data/unidata/SpecialCasing.txt
+++ b/source/data/unidata/SpecialCasing.txt
@@ -1,5 +1,5 @@
-# SpecialCasing-12.0.0.txt
-# Date: 2019-01-22, 08:18:50 GMT
+# SpecialCasing-12.1.0.txt
+# Date: 2019-03-10, 10:53:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
diff --git a/source/data/unidata/UCARules.txt b/source/data/unidata/UCARules.txt
index 0bbea76..264fa88 100644
--- a/source/data/unidata/UCARules.txt
+++ b/source/data/unidata/UCARules.txt
@@ -1,10 +1,10 @@
# UCA_Rules_SHORT.txt
-# Date: 2019-02-14, 21:26:41 GMT
+# Date: 2019-04-01, 20:17:28 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
-# UCA Version: 12.0.0
-# UCD Version: 12.0.0
+# UCA Version: 12.1.0
+# UCD Version: 12.1.0
# For a description of the format and usage, see
# http://www.unicode.org/reports/tr35/tr35-collation.html#Root_Data_Files
@@ -331,15 +331,15 @@
= 𑍲
= 𑍳
= 𑍴
- =
- =
- =
- =
- =
- =
- =
- =
- =
+ = '\U00013430'
+ = '\U00013431'
+ = '\U00013432'
+ = '\U00013433'
+ = '\U00013434'
+ = '\U00013435'
+ = '\U00013436'
+ = '\U00013437'
+ = '\U00013438'
= '\U0001BCA0'
= '\U0001BCA1'
= '\U0001BCA2'
@@ -29294,6 +29294,8 @@
<<< ㆟
& 亻
<<< ⺅
+& 令
+ < ㋿ / 和
& 企
<<< ㊭
& 休
diff --git a/source/data/unidata/UnicodeData.txt b/source/data/unidata/UnicodeData.txt
index d88a601..e65aec5 100644
--- a/source/data/unidata/UnicodeData.txt
+++ b/source/data/unidata/UnicodeData.txt
@@ -11856,6 +11856,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;;;;;
3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
diff --git a/source/data/unidata/changes.txt b/source/data/unidata/changes.txt
index af96e68..833868f 100644
--- a/source/data/unidata/changes.txt
+++ b/source/data/unidata/changes.txt
@@ -49,6 +49,279 @@
---------------------------------------------------------------------------- ***
+Unicode 12.1 update for ICU 64.2
+
+** This is an abbreviated update with one new character for the new
+** Japanese era expected to start on 2019-May-01: U+32FF SQUARE ERA NAME REIWA
+https://en.wikipedia.org/wiki/Reiwa_period
+
+http://www.unicode.org/versions/Unicode12.1.0/
+
+ICU-20497 Unicode 12.1
+
+cldrbug 11978: Unicode 12.1
+
+* Command-line environment setup
+
+UNICODE_DATA=~/unidata/uni121/20190403
+CLDR_SRC=~/svn.cldr/uni
+ICU_ROOT=~/icu/uni
+ICU_SRC=$ICU_ROOT/src
+ICUDT=icudt64b
+ICU4C_DATA_IN=$ICU_SRC/icu4c/source/data/in
+ICU4C_UNIDATA=$ICU_SRC/icu4c/source/data/unidata
+export LD_LIBRARY_PATH=$ICU_ROOT/dbg/icu4c/lib
+
+*** Unicode version numbers
+- makedata.mak
+- uchar.h
+- com.ibm.icu.util.VersionInfo
+- com.ibm.icu.dev.test.lang.UCharacterTest.VERSION_
+
+- Run ICU4C "configure" _after_ updating the Unicode version number in uchar.h
+ so that the makefiles see the new version number.
+ cd $ICU_ROOT/dbg/icu4c
+ ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ../../../doconfig-clang-dbg.sh
+
+*** data files & enums & parser code
+
+* download files
+- mkdir -p $UNICODE_DATA
+- download Unicode files into $UNICODE_DATA
+ + subfolders: emoji, idna, security, ucd, uca
+ + inside ucd: extract Unihan.zip to "here" (.../ucd/Unihan/*.txt), delete Unihan.zip
+
+* for manual diffs and for Unicode Tools input data updates:
+ remove version suffixes from the file names
+ ~$ unidata/desuffixucd.py $UNICODE_DATA
+ (see https://sites.google.com/site/unicodetools/inputdata)
+
+* process and/or copy files
+- $ICU_SRC/tools/unicode$ py/preparseucd.py $UNICODE_DATA $ICU_SRC
+ + This writes files (especially ppucd.txt) to the ICU4C unidata and testdata subfolders.
+ + For debugging, and tweaking how ppucd.txt is written,
+ the tool has an --only_ppucd option:
+ py/preparseucd.py $UNICODE_DATA --only_ppucd path/to/ppucd/outputfile
+
+- cp -v $UNICODE_DATA/security/confusables.txt $ICU4C_UNIDATA
+
+* build ICU (make install)
+ so that the tools build can pick up the new definitions from the installed header files.
+
+ $ICU_ROOT/dbg/icu4c$ echo;echo; date; make -j7 install &> out.txt ; tail -n 30 out.txt ; date
+
+* update spoof checker UnicodeSet initializers:
+ inclusionPat & recommendedPat in uspoof.cpp
+ INCLUSION & RECOMMENDED in SpoofChecker.java
+- make sure that the Unicode Tools tree contains the latest security data files
+- go to Unicode Tools org.unicode.text.tools.RecommendedSetGenerator
+- update the hardcoded version number there in the DIRECTORY path
+- run the tool (no special environment variables needed)
+- copy & paste from the Console output into the .cpp & .java files
+
+* generate normalization data files
+ cd $ICU_ROOT/dbg/icu4c
+ bin/gennorm2 -o $ICU_SRC/icu4c/source/common/norm2_nfc_data.h -s $ICU4C_UNIDATA/norm2 nfc.txt --csource
+ bin/gennorm2 -o $ICU4C_DATA_IN/nfc.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt
+ bin/gennorm2 -o $ICU4C_DATA_IN/nfkc.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt nfkc.txt
+ bin/gennorm2 -o $ICU4C_DATA_IN/nfkc_cf.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt nfkc.txt nfkc_cf.txt
+ bin/gennorm2 -o $ICU4C_DATA_IN/uts46.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt uts46.txt
+
+* build ICU (make install)
+ so that the tools build can pick up the new definitions from the installed header files.
+
+ $ICU_ROOT/dbg/icu4c$ echo;echo; make -j7 install &> out.txt ; tail -n 30 out.txt ; date
+
+* build Unicode tools using CMake+make
+
+$ICU_SRC/tools/unicode/c/icudefs.txt:
+
+# Location (--prefix) of where ICU was installed.
+set(ICU_INST_DIR /usr/local/google/home/mscherer/icu/mine/inst/icu4c)
+# Location of the ICU4C source tree.
+set(ICU4C_SRC_DIR /usr/local/google/home/mscherer/icu/uni/src/icu4c)
+
+ $ICU_ROOT/dbg$
+ mkdir -p tools/unicode/c
+ cd tools/unicode/c
+
+ $ICU_ROOT/dbg/tools/unicode/c$
+ cmake ../../../../src/tools/unicode/c
+ make
+
+* generate core properties data files
+ $ICU_ROOT/dbg/tools/unicode/c$
+ genprops/genprops $ICU_SRC/icu4c
+ genuca/genuca --hanOrder implicit $ICU_SRC/icu4c && \
+ genuca/genuca --hanOrder radical-stroke $ICU_SRC/icu4c
+- rebuild ICU (make install) & tools
+
+* update uts46test.cpp and UTS46Test.java if there are new characters that are equivalent to
+ sequences with non-LDH ASCII (that is, their decompositions contain '=' or similar)
+- grep IdnaMappingTable.txt or uts46.txt for "disallowed_STD3_valid" on non-ASCII characters
+- Unicode 6.0..12.1: U+2260, U+226E, U+226F
+- nothing new in this Unicode version, no test file to update
+
+* run & fix ICU4C tests
+- Andy handles RBBI & spoof check test failures
+
+* collation: CLDR collation root, UCA DUCET
+
+- UCA DUCET goes into Mark's Unicode tools, see
+ https://sites.google.com/site/unicodetools/home#TOC-UCA
+ diff the main mapping file, look for bad changes
+ (for example, more bytes per weight for common characters)
+ ~/svn.unitools/trunk$ sed -r -f ~/svn.cldr/uni/tools/scripts/uca/blankweights.sed ../Generated/UCA/12.1.0/CollationAuxiliary/FractionalUCA.txt > ../frac-12.1.txt
+ ~/svn.unitools/trunk$ meld ../frac-12.txt ../frac-12.1.txt
+
+- CLDR root data files are checked into $CLDR_SRC/common/uca/
+ cp (Unicode Tools UCA generated)/CollationAuxiliary/* $CLDR_SRC/common/uca/
+
+- update source/data/unidata/FractionalUCA.txt with FractionalUCA_SHORT.txt
+ cp -v $CLDR_SRC/common/uca/FractionalUCA_SHORT.txt $ICU4C_UNIDATA/FractionalUCA.txt
+- update source/data/unidata/UCARules.txt with UCA_Rules_SHORT.txt
+ cp -v $ICU4C_UNIDATA/UCARules.txt /tmp/UCARules-old.txt
+ (note removing the underscore before "Rules")
+ cp -v $CLDR_SRC/common/uca/UCA_Rules_SHORT.txt $ICU4C_UNIDATA/UCARules.txt
+- restore TODO diffs in UCARules.txt
+ meld /tmp/UCARules-old.txt $ICU4C_UNIDATA/UCARules.txt
+- update (ICU4C)/source/test/testdata/CollationTest_*.txt
+ and (ICU4J)/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_*.txt
+ from the CLDR root files (..._CLDR_..._SHORT.txt)
+ cp -v $CLDR_SRC/common/uca/CollationTest_CLDR_NON_IGNORABLE_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
+ cp -v $CLDR_SRC/common/uca/CollationTest_CLDR_SHIFTED_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
+ cp -v $ICU_SRC/icu4c/source/test/testdata/CollationTest_*.txt $ICU_SRC/icu4j/main/tests/collate/src/com/ibm/icu/dev/data
+- if CLDR common/uca/unihan-index.txt changes, then update
+ CLDR common/collation/root.xml <collation type="private-unihan">
+ and regenerate (or update in parallel) $ICU_SRC/icu4c/source/data/coll/root.txt
+
+- run genuca, see command line above
+- rebuild ICU4C
+
+* Unihan collators
+ https://sites.google.com/site/unicodetools/unihan
+- run Unicode Tools
+ org.unicode.draft.GenerateUnihanCollators
+ with VM arguments
+ -ea
+ -DSVN_WORKSPACE=/usr/local/google/home/mscherer/svn.unitools/trunk
+ -DOTHER_WORKSPACE=/usr/local/google/home/mscherer/svn.unitools
+ -DUCD_DIR=/usr/local/google/home/mscherer/svn.unitools/trunk/data
+ -DCLDR_DIR=/usr/local/google/home/mscherer/svn.cldr/uni
+ -DUVERSION=12.1.0
+- run Unicode Tools
+ org.unicode.draft.GenerateUnihanCollatorFiles
+ with the same arguments
+- check CLDR diffs
+ cd $CLDR_SRC
+ meld common/collation/zh.xml ../Generated/cldr/han/replace/zh.xml
+ meld common/transforms/Han-Latin.xml ../Generated/cldr/han/replace/Han-Latin.xml
+- copy to CLDR
+ cd $CLDR_SRC
+ cp ../Generated/cldr/han/replace/zh.xml common/collation/zh.xml
+ cp ../Generated/cldr/han/replace/Han-Latin.xml common/transforms/Han-Latin.xml
+- run CLDR unit tests, commit to CLDR
+- generate ICU zh collation data: run CLDR
+ org.unicode.cldr.icu.NewLdml2IcuConverter
+ with program arguments
+ -t collation
+ -s /usr/local/google/home/mscherer/svn.cldr/uni/common/collation
+ -m /usr/local/google/home/mscherer/svn.cldr/uni/common/supplemental
+ -d /usr/local/google/home/mscherer/icu/uni/src/icu4c/source/data/coll
+ -p /usr/local/google/home/mscherer/icu/uni/src/icu4c/source/data/xml/collation
+ zh
+ and VM arguments
+ -ea
+ -DCLDR_DIR=/usr/local/google/home/mscherer/svn.cldr/uni
+- rebuild ICU4C
+
+* run & fix ICU4C tests, now with new CLDR collation root data
+- run all tests with the collation test data *_SHORT.txt or the full files
+ (the full ones have comments, useful for debugging)
+- note on intltest: if collate/UCAConformanceTest fails, then
+ utility/MultithreadTest/TestCollators will fail as well;
+ fix the conformance test before looking into the multi-thread test
+
+* update Java data files
+- refresh just the UCD/UCA-related/derived files, just to be safe
+- see (ICU4C)/source/data/icu4j-readme.txt
+- mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
+ output:
+ ...
+ make[1]: Entering directory '/usr/local/google/home/mscherer/icu/uni/dbg/icu4c/data'
+ mkdir -p ./out/icu4j/com/ibm/icu/impl/data/icudt64b
+ mkdir -p ./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt64b
+ LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/icupkg ./out/tmp/icudt64l.dat ./out/icu4j/icudt64b.dat -s ./out/build/icudt64l -x '*' -tb -d ./out/icu4j/com/ibm/icu/impl/data/icudt64b
+ mv ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/zoneinfo64.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/metaZones.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/timezoneTypes.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt64b/windowsZones.res" "./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt64b"
+ jar cf ./out/icu4j/icudata.jar -C ./out/icu4j com/ibm/icu/impl/data/icudt64b/
+ mkdir -p /tmp/icu4j/main/shared/data
+ cp ./out/icu4j/icudata.jar /tmp/icu4j/main/shared/data
+ jar cf ./out/icu4j/icutzdata.jar -C ./out/icu4j/tzdata com/ibm/icu/impl/data/icudt64b/
+ mkdir -p /tmp/icu4j/main/shared/data
+ cp ./out/icu4j/icutzdata.jar /tmp/icu4j/main/shared/data
+ make[1]: Leaving directory '/usr/local/google/home/mscherer/icu/uni/dbg/icu4c/data'
+- copy the big-endian Unicode data files to another location,
+ separate from the other data files,
+ and then refresh ICU4J
+ cd $ICU_ROOT/dbg/icu4c/data/out/icu4j
+ mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
+ mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/brkitr
+ cp -v com/ibm/icu/impl/data/$ICUDT/confusables.cfu /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+ cp -v com/ibm/icu/impl/data/$ICUDT/*.icu /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+ rm /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/cnvalias.icu
+ cp -v com/ibm/icu/impl/data/$ICUDT/*.nrm /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+ cp -v com/ibm/icu/impl/data/$ICUDT/coll/* /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
+ cp -v com/ibm/icu/impl/data/$ICUDT/brkitr/* /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/brkitr
+ jar uvf $ICU_SRC/icu4j/main/shared/data/icudata.jar -C /tmp/icu4j com/ibm/icu/impl/data/$ICUDT
+
+* When refreshing all of ICU4J data from ICU4C
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
+- cp /tmp/icu4j/main/shared/data/icudata.jar $ICU_SRC/icu4j/main/shared/data
+or
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=$ICU_SRC/icu4j icu4j-data-install
+
+* update CollationFCD.java
+ + copy & paste the initializers of lcccIndex[] etc. from
+ ICU4C/source/i18n/collationfcd.cpp to
+ ICU4J/main/classes/collate/src/com/ibm/icu/impl/coll/CollationFCD.java
+
+* refresh Java test .txt files
+- copy new .txt files into ICU4J's main/tests/core/src/com/ibm/icu/dev/data/unicode
+ cd $ICU_SRC/icu4c/source/data/unidata
+ cp -v confusables.txt confusablesWholeScript.txt NormalizationCorrections.txt NormalizationTest.txt SpecialCasing.txt UnicodeData.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+ cd ../../test/testdata
+ cp -v BidiCharacterTest.txt BidiTest.txt IdnaTestV2.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+ cp -v $UNICODE_DATA/ucd/CompositionExclusions.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+
+* run & fix ICU4J tests
+
+*** API additions
+- send notice to icu-design about new born-@stable API (enum constants etc.)
+
+*** CLDR numbering systems
+- look for new sets of decimal digits (gc=ND & nv=4) and add to CLDR
+ for example, look for
+ ~/icu/uni/src$ egrep ';gc=Nd.+;nv=4' icu4c/source/data/unidata/ppucd.txt
+ in new blocks (Blocks.txt)
+ Unicode 12: using Unicode 12 CLDR ticket #11478
+ hmnp 1E140..1E149 Nyiakeng_Puachue_Hmong
+ wcho 1E2F0..1E2F9 Wancho
+ Unicode 11: using Unicode 11 CLDR ticket #10978
+ rohg 10D30..10D39 Hanifi_Rohingya
+ gong 11DA0..11DA9 Gunjala_Gondi
+ Earlier: CLDR tickets specific to adding new numbering systems.
+ Unicode 10: http://unicode.org/cldr/trac/ticket/10219
+ Unicode 9: http://unicode.org/cldr/trac/ticket/9692
+
+*** merge the Unicode update branches back onto the trunk
+- do not merge the icudata.jar and testdata.jar,
+ instead rebuild them from merged & tested ICU4C
+- make sure that changes to Unicode tools are checked in:
+ http://www.unicode.org/utility/trac/log/trunk/unicodetools
+
+---------------------------------------------------------------------------- ***
+
Unicode 12.0 update for ICU 64
http://www.unicode.org/versions/Unicode12.0.0/
diff --git a/source/data/unidata/confusables.txt b/source/data/unidata/confusables.txt
index 4ad83e4..ee85eee 100644
--- a/source/data/unidata/confusables.txt
+++ b/source/data/unidata/confusables.txt
@@ -1,11 +1,11 @@
# confusables.txt
-# Date: 2018-11-05, 07:39:47 GMT
-# © 2018 Unicode®, Inc.
+# Date: 2019-04-01, 21:59:19 GMT
+# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# Unicode Security Mechanisms for UTS #39
-# Version: 12.0.0
+# Version: 12.1.0
#
# For documentation and usage, see http://www.unicode.org/reports/tr39
#
@@ -2353,7 +2353,7 @@
A795 ; A727 ; MA # ( ꞕ → ꜧ ) LATIN SMALL LETTER H WITH PALATAL HOOK → LATIN SMALL LETTER HENG #
02DB ; 0069 ; MA #* ( ˛ → i ) OGONEK → LATIN SMALL LETTER I # →ͺ→→ι→→ι→
-2373 ; 0069 ; MA #* ( ⍳ → i ) APL FUNCTIONAL SYMBOL IOTA → LATIN SMALL LETTER I # →ɩ→
+2373 ; 0069 ; MA #* ( ⍳ → i ) APL FUNCTIONAL SYMBOL IOTA → LATIN SMALL LETTER I # →ι→
FF49 ; 0069 ; MA # ( ｉ → i ) FULLWIDTH LATIN SMALL LETTER I → LATIN SMALL LETTER I # →і→
2170 ; 0069 ; MA # ( ⅰ → i ) SMALL ROMAN NUMERAL ONE → LATIN SMALL LETTER I #
2139 ; 0069 ; MA # ( ℹ → i ) INFORMATION SOURCE → LATIN SMALL LETTER I #
diff --git a/source/data/unidata/norm2/nfc.txt b/source/data/unidata/norm2/nfc.txt
index 62be5d7..31dc256 100644
--- a/source/data/unidata/norm2/nfc.txt
+++ b/source/data/unidata/norm2/nfc.txt
@@ -9,7 +9,7 @@
#
# Complete data for Unicode NFC normalization.
-* Unicode 12.0.0
+* Unicode 12.1.0
# Canonical_Combining_Class (ccc) values
0300..0314:230
diff --git a/source/data/unidata/norm2/nfkc.txt b/source/data/unidata/norm2/nfkc.txt
index 1ab0d38..a1e363f 100644
--- a/source/data/unidata/norm2/nfkc.txt
+++ b/source/data/unidata/norm2/nfkc.txt
@@ -13,7 +13,7 @@
# to NFKC one-way mappings.
# Use this file as the second gennorm2 input file after nfc.txt.
-* Unicode 12.0.0
+* Unicode 12.1.0
00A0>0020
00A8>0020 0308
@@ -1107,6 +1107,7 @@
32FC>30F0
32FD>30F1
32FE>30F2
+32FF>4EE4 548C
3300>30A2 30D1 30FC 30C8
3301>30A2 30EB 30D5 30A1
3302>30A2 30F3 30DA 30A2
diff --git a/source/data/unidata/norm2/nfkc_cf.txt b/source/data/unidata/norm2/nfkc_cf.txt
index 6f15a6b..3248c3a 100644
--- a/source/data/unidata/norm2/nfkc_cf.txt
+++ b/source/data/unidata/norm2/nfkc_cf.txt
@@ -12,7 +12,7 @@
# and reformatted into syntax for the gennorm2 Normalizer2 data generator tool.
# Use this file as the third gennorm2 input file after nfc.txt and nfkc.txt.
-* Unicode 12.0.0
+* Unicode 12.1.0
0041>0061
0042>0062
@@ -2082,6 +2082,7 @@
32FC>30F0
32FD>30F1
32FE>30F2
+32FF>4EE4 548C
3300>30A2 30D1 30FC 30C8
3301>30A2 30EB 30D5 30A1
3302>30A2 30F3 30DA 30A2
diff --git a/source/data/unidata/norm2/uts46.txt b/source/data/unidata/norm2/uts46.txt
index 2ffb466..15427fc 100644
--- a/source/data/unidata/norm2/uts46.txt
+++ b/source/data/unidata/norm2/uts46.txt
@@ -1,12 +1,14 @@
# Original file:
-# IdnaMappingTable-12.0.0.txt
-# Date: 2019-03-02, 13:45:26 GMT
+# IdnaMappingTable.txt
+# Date: 2019-04-01, 09:17:25 GMT
# © 2019 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
-# Unicode IDNA Compatible Preprocessing (UTS #46)
-# For documentation, see http://www.unicode.org/reports/tr46/
+# Unicode IDNA Compatible Preprocessing for UTS #46
+# Version: 12.1.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr46
# ================================================
# This file has been reformatted into syntax for the
@@ -23,7 +25,7 @@
#
# Use this file as the second gennorm2 input file after nfc.txt.
# ================================================
-
+#
# 0000..002C disallowed_STD3_valid # 1.1 <control-0000>..COMMA
# 002D..002E valid # 1.1 HYPHEN-MINUS..FULL STOP
# 002F disallowed_STD3_valid # 1.1 SOLIDUS
@@ -3664,7 +3666,7 @@
32FC >30F0 # 1.1 CIRCLED KATAKANA WI
32FD >30F1 # 1.1 CIRCLED KATAKANA WE
32FE >30F2 # 1.1 CIRCLED KATAKANA WO
-32FF >FFFD # NA <reserved-32FF>
+32FF >4EE4 548C # 12.1 SQUARE ERA NAME REIWA
3300 >30A2 30D1 30FC 30C8 #1.1 SQUARE APAATO
3301 >30A2 30EB 30D5 30A1 #1.1 SQUARE ARUHUA
3302 >30A2 30F3 30DA 30A2 #1.1 SQUARE ANPEA
diff --git a/source/data/unidata/ppucd.txt b/source/data/unidata/ppucd.txt
index 20f86ba..83a8e59 100644
--- a/source/data/unidata/ppucd.txt
+++ b/source/data/unidata/ppucd.txt
@@ -1,7 +1,7 @@
# Preparsed UCD generated by ICU preparseucd.py
# Copyright (C) 1991 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html
-ucd;12.0.0
+ucd;12.1.0
property;Catalog;age;Age
property;Binary;AHex;ASCII_Hex_Digit
@@ -124,6 +124,7 @@
value;age;10.0;V10_0
value;age;11.0;V11_0
value;age;12.0;V12_0
+value;age;12.1;V12_1
value;age;2.0;V2_0
value;age;2.1;V2_1
value;age;3.0;V3_0
@@ -14837,7 +14838,8 @@
cp;32FC;dm=30F0;na=CIRCLED KATAKANA WI;NFKC_CF=30F0;sc=Kana;WB=KA
cp;32FD;dm=30F1;na=CIRCLED KATAKANA WE;NFKC_CF=30F1;sc=Kana;WB=KA
cp;32FE;dm=30F2;na=CIRCLED KATAKANA WO;NFKC_CF=30F2;sc=Kana;WB=KA
-unassigned;32FF;vo=U
+# Japanese era name
+cp;32FF;age=12.1;dm=4EE4 548C;dt=Sqr;na=SQUARE ERA NAME REIWA;NFKC_CF=4EE4 548C;scx=Hani;vo=Tu
block;3300..33FF;age=1.1;blk=CJK_Compat;CWKCF;dt=Sqr;ea=W;gc=So;Gr_Base;lb=ID;NFKC_QC=N;NFKD_QC=N;sc=Zyyy;vo=U
# 3300..33FF CJK Compatibility
diff --git a/source/data/unit/am.txt b/source/data/unit/am.txt
index 872715f..b72edd9 100644
--- a/source/data/unit/am.txt
+++ b/source/data/unit/am.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
am{
- Version{"2.1.48.18"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ar.txt b/source/data/unit/ar.txt
index 4d45ce8..5a73adc 100644
--- a/source/data/unit/ar.txt
+++ b/source/data/unit/ar.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ar{
- Version{"2.1.48.22"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/az.txt b/source/data/unit/az.txt
index 9caad2a..cb6d5b8 100644
--- a/source/data/unit/az.txt
+++ b/source/data/unit/az.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
az{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/be.txt b/source/data/unit/be.txt
index 639f347..2213627 100644
--- a/source/data/unit/be.txt
+++ b/source/data/unit/be.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
be{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"hh:mm"}
hms{"hh:mm:ss"}
diff --git a/source/data/unit/bs.txt b/source/data/unit/bs.txt
index db517ee..f590e3f 100644
--- a/source/data/unit/bs.txt
+++ b/source/data/unit/bs.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
bs{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/bs_Cyrl.txt b/source/data/unit/bs_Cyrl.txt
index 3aa033b..5d82bc3 100644
--- a/source/data/unit/bs_Cyrl.txt
+++ b/source/data/unit/bs_Cyrl.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
bs_Cyrl{
%%Parent{"root"}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
units{
duration{
day{
diff --git a/source/data/unit/ceb.txt b/source/data/unit/ceb.txt
index c898591..052bbb1 100644
--- a/source/data/unit/ceb.txt
+++ b/source/data/unit/ceb.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ceb{
- Version{"2.1.49.33"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/chr.txt b/source/data/unit/chr.txt
index 87429d1..fc987cd 100644
--- a/source/data/unit/chr.txt
+++ b/source/data/unit/chr.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
chr{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/cy.txt b/source/data/unit/cy.txt
index 3093f11..174af45 100644
--- a/source/data/unit/cy.txt
+++ b/source/data/unit/cy.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
cy{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/da.txt b/source/data/unit/da.txt
index d2cc282..fcdb1b9 100644
--- a/source/data/unit/da.txt
+++ b/source/data/unit/da.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
da{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h.mm"}
hms{"h.mm.ss"}
diff --git a/source/data/unit/el.txt b/source/data/unit/el.txt
index 71f4447..75888ee 100644
--- a/source/data/unit/el.txt
+++ b/source/data/unit/el.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
el{
- Version{"2.1.49.26"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/es.txt b/source/data/unit/es.txt
index aee6458..649487e 100644
--- a/source/data/unit/es.txt
+++ b/source/data/unit/es.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
es{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/eu.txt b/source/data/unit/eu.txt
index b8b26ec..ade836a 100644
--- a/source/data/unit/eu.txt
+++ b/source/data/unit/eu.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
eu{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/fa.txt b/source/data/unit/fa.txt
index 8f2c8c1..b085990 100644
--- a/source/data/unit/fa.txt
+++ b/source/data/unit/fa.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fa{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/fil.txt b/source/data/unit/fil.txt
index 3bfb215..cbadc74 100644
--- a/source/data/unit/fil.txt
+++ b/source/data/unit/fil.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fil{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/fr.txt b/source/data/unit/fr.txt
index cc6683b..01d6379 100644
--- a/source/data/unit/fr.txt
+++ b/source/data/unit/fr.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fr{
- Version{"2.1.48.43"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ga.txt b/source/data/unit/ga.txt
index cf4cf0d..773d273 100644
--- a/source/data/unit/ga.txt
+++ b/source/data/unit/ga.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ga{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/gd.txt b/source/data/unit/gd.txt
index 790f594..d1c5210 100644
--- a/source/data/unit/gd.txt
+++ b/source/data/unit/gd.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
gd{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/gl.txt b/source/data/unit/gl.txt
index 4ba8b4f..048ee46 100644
--- a/source/data/unit/gl.txt
+++ b/source/data/unit/gl.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
gl{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/hi.txt b/source/data/unit/hi.txt
index b930f77..fff5e9c 100644
--- a/source/data/unit/hi.txt
+++ b/source/data/unit/hi.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hi{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/hy.txt b/source/data/unit/hy.txt
index 7b46b38..28dc466 100644
--- a/source/data/unit/hy.txt
+++ b/source/data/unit/hy.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hy{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/is.txt b/source/data/unit/is.txt
index ecc19e7..cf4ad54 100644
--- a/source/data/unit/is.txt
+++ b/source/data/unit/is.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
is{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ja.txt b/source/data/unit/ja.txt
index 2e40c55..ce47c9a 100644
--- a/source/data/unit/ja.txt
+++ b/source/data/unit/ja.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ja{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/kk.txt b/source/data/unit/kk.txt
index df09392..e2098ac 100644
--- a/source/data/unit/kk.txt
+++ b/source/data/unit/kk.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kk{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/km.txt b/source/data/unit/km.txt
index d8612cd..78eec65 100644
--- a/source/data/unit/km.txt
+++ b/source/data/unit/km.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
km{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ko.txt b/source/data/unit/ko.txt
index 0e7324a..35d06b6 100644
--- a/source/data/unit/ko.txt
+++ b/source/data/unit/ko.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ko{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/kok.txt b/source/data/unit/kok.txt
index 48157f3..1b0ec89 100644
--- a/source/data/unit/kok.txt
+++ b/source/data/unit/kok.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kok{
- Version{"2.1.48.4"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ky.txt b/source/data/unit/ky.txt
index c0fd1e1..fb60be8 100644
--- a/source/data/unit/ky.txt
+++ b/source/data/unit/ky.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ky{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/lb.txt b/source/data/unit/lb.txt
index 9a41d65..eae1be5 100644
--- a/source/data/unit/lb.txt
+++ b/source/data/unit/lb.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
lb{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/mi.txt b/source/data/unit/mi.txt
index 679553d..4948aa7 100644
--- a/source/data/unit/mi.txt
+++ b/source/data/unit/mi.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mi{
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/mt.txt b/source/data/unit/mt.txt
index cbe79cd..feaaad4 100644
--- a/source/data/unit/mt.txt
+++ b/source/data/unit/mt.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mt{
- Version{"2.1.47.72"}
+ Version{"2.1.49.82"}
units{
angle{
arc-minute{
diff --git a/source/data/unit/my.txt b/source/data/unit/my.txt
index 4717f83..e884fda 100644
--- a/source/data/unit/my.txt
+++ b/source/data/unit/my.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
my{
- Version{"2.1.48.36"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ne.txt b/source/data/unit/ne.txt
index f74a7c5..e243476 100644
--- a/source/data/unit/ne.txt
+++ b/source/data/unit/ne.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ne{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/nl.txt b/source/data/unit/nl.txt
index 1a906c0..8b7e7e6 100644
--- a/source/data/unit/nl.txt
+++ b/source/data/unit/nl.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
nl{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/nn.txt b/source/data/unit/nn.txt
index 2dee271..472aad9 100644
--- a/source/data/unit/nn.txt
+++ b/source/data/unit/nn.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
nn{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/or.txt b/source/data/unit/or.txt
index 6596ae1..145e554 100644
--- a/source/data/unit/or.txt
+++ b/source/data/unit/or.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
or{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ps.txt b/source/data/unit/ps.txt
index 4af3da9..0cd0306 100644
--- a/source/data/unit/ps.txt
+++ b/source/data/unit/ps.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ps{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/pt_PT.txt b/source/data/unit/pt_PT.txt
index 81ec9ca..87189a8 100644
--- a/source/data/unit/pt_PT.txt
+++ b/source/data/unit/pt_PT.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
pt_PT{
- Version{"2.1.47.89"}
+ Version{"2.1.49.82"}
units{
acceleration{
g-force{
diff --git a/source/data/unit/qu.txt b/source/data/unit/qu.txt
index d1f2109..feb4876 100644
--- a/source/data/unit/qu.txt
+++ b/source/data/unit/qu.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
qu{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ro.txt b/source/data/unit/ro.txt
index 1af0f1d..943f4fb 100644
--- a/source/data/unit/ro.txt
+++ b/source/data/unit/ro.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ro{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/root.txt b/source/data/unit/root.txt
index 0d627d8..7c4dc76 100644
--- a/source/data/unit/root.txt
+++ b/source/data/unit/root.txt
@@ -4,7 +4,7 @@
* ICU <specials> source: <path>/common/main/root.xml
*/
root{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ru.txt b/source/data/unit/ru.txt
index 2399061..57e2d18 100644
--- a/source/data/unit/ru.txt
+++ b/source/data/unit/ru.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ru{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/rw.txt b/source/data/unit/rw.txt
index 925e641..629f001 100644
--- a/source/data/unit/rw.txt
+++ b/source/data/unit/rw.txt
@@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
rw{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/unit/sd.txt b/source/data/unit/sd.txt
index 23d390e..00f079f 100644
--- a/source/data/unit/sd.txt
+++ b/source/data/unit/sd.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
sd{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/so.txt b/source/data/unit/so.txt
index 6303191..ce0a674 100644
--- a/source/data/unit/so.txt
+++ b/source/data/unit/so.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
so{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/sr.txt b/source/data/unit/sr.txt
index 12776c7..14b7ada 100644
--- a/source/data/unit/sr.txt
+++ b/source/data/unit/sr.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
sr{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/sr_Latn.txt b/source/data/unit/sr_Latn.txt
index 16ae167..1570128 100644
--- a/source/data/unit/sr_Latn.txt
+++ b/source/data/unit/sr_Latn.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
sr_Latn{
%%Parent{"root"}
- Version{"2.1.48.77"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/tg.txt b/source/data/unit/tg.txt
index 50abf75..b56b9b9 100644
--- a/source/data/unit/tg.txt
+++ b/source/data/unit/tg.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
tg{
- Version{"2.1.47.96"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/th.txt b/source/data/unit/th.txt
index 2259172..ecb71c1 100644
--- a/source/data/unit/th.txt
+++ b/source/data/unit/th.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
th{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ti.txt b/source/data/unit/ti.txt
index 2096e45..7fadb70 100644
--- a/source/data/unit/ti.txt
+++ b/source/data/unit/ti.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ti{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/tk.txt b/source/data/unit/tk.txt
index 6d7d379..3f5125d 100644
--- a/source/data/unit/tk.txt
+++ b/source/data/unit/tk.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
tk{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"hh:mm:ss"}
diff --git a/source/data/unit/tt.txt b/source/data/unit/tt.txt
index df84841..713bf16 100644
--- a/source/data/unit/tt.txt
+++ b/source/data/unit/tt.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
tt{
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ug.txt b/source/data/unit/ug.txt
index a6bc418..79102f0 100644
--- a/source/data/unit/ug.txt
+++ b/source/data/unit/ug.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ug{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
units{
acceleration{
g-force{
diff --git a/source/data/unit/uk.txt b/source/data/unit/uk.txt
index 7dd63fb..fb153f2 100644
--- a/source/data/unit/uk.txt
+++ b/source/data/unit/uk.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
uk{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/ur.txt b/source/data/unit/ur.txt
index 3a5ac63..8b08d7d 100644
--- a/source/data/unit/ur.txt
+++ b/source/data/unit/ur.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ur{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/uz.txt b/source/data/unit/uz.txt
index 68ef374..8582466 100644
--- a/source/data/unit/uz.txt
+++ b/source/data/unit/uz.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
uz{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/uz_Cyrl.txt b/source/data/unit/uz_Cyrl.txt
index 7feaf3f..02a53ab 100644
--- a/source/data/unit/uz_Cyrl.txt
+++ b/source/data/unit/uz_Cyrl.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
uz_Cyrl{
%%Parent{"root"}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/vi.txt b/source/data/unit/vi.txt
index 1ed799f..1feefce 100644
--- a/source/data/unit/vi.txt
+++ b/source/data/unit/vi.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
vi{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/wo.txt b/source/data/unit/wo.txt
index 420757b..a639fe9 100644
--- a/source/data/unit/wo.txt
+++ b/source/data/unit/wo.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
wo{
- Version{"2.1.47.84"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/xh.txt b/source/data/unit/xh.txt
index 59006fb..3adb593 100644
--- a/source/data/unit/xh.txt
+++ b/source/data/unit/xh.txt
@@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
xh{
- Version{"2.1.48.89"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/unit/yue.txt b/source/data/unit/yue.txt
index 06613e7..8f15017 100644
--- a/source/data/unit/yue.txt
+++ b/source/data/unit/yue.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
yue{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/yue_Hans.txt b/source/data/unit/yue_Hans.txt
index b8d4025..25f8fa7 100644
--- a/source/data/unit/yue_Hans.txt
+++ b/source/data/unit/yue_Hans.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
yue_Hans{
%%Parent{"root"}
- Version{"2.1.48.80"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/zh.txt b/source/data/unit/zh.txt
index 36e1991..ec19713 100644
--- a/source/data/unit/zh.txt
+++ b/source/data/unit/zh.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
zh{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/unit/zh_Hant.txt b/source/data/unit/zh_Hant.txt
index 19930ac..3a84297 100644
--- a/source/data/unit/zh_Hant.txt
+++ b/source/data/unit/zh_Hant.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
zh_Hant{
%%Parent{"root"}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
diff --git a/source/data/zone/am.txt b/source/data/zone/am.txt
index a57f632..8a02b3a 100644
--- a/source/data/zone/am.txt
+++ b/source/data/zone/am.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
am{
- Version{"2.1.48.18"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"አቢጃን"}
diff --git a/source/data/zone/ar.txt b/source/data/zone/ar.txt
index 16bb284..ab5705e 100644
--- a/source/data/zone/ar.txt
+++ b/source/data/zone/ar.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ar{
- Version{"2.1.48.22"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"أبيدجان"}
diff --git a/source/data/zone/az.txt b/source/data/zone/az.txt
index 1f11bf5..ba56568 100644
--- a/source/data/zone/az.txt
+++ b/source/data/zone/az.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
az{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abican"}
diff --git a/source/data/zone/be.txt b/source/data/zone/be.txt
index fcd39fb..44bee49 100644
--- a/source/data/zone/be.txt
+++ b/source/data/zone/be.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
be{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абіджан"}
diff --git a/source/data/zone/bs.txt b/source/data/zone/bs.txt
index ad4e169..a00a3c1 100644
--- a/source/data/zone/bs.txt
+++ b/source/data/zone/bs.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
bs{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/bs_Cyrl.txt b/source/data/zone/bs_Cyrl.txt
index 132c8a3..9664a05 100644
--- a/source/data/zone/bs_Cyrl.txt
+++ b/source/data/zone/bs_Cyrl.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
bs_Cyrl{
%%Parent{"root"}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиџан"}
diff --git a/source/data/zone/ceb.txt b/source/data/zone/ceb.txt
index 6dd74c1..4b1e362 100644
--- a/source/data/zone/ceb.txt
+++ b/source/data/zone/ceb.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ceb{
- Version{"2.1.49.33"}
+ Version{"2.1.49.82"}
zoneStrings{
"Etc:UTC"{
ls{"Koordinado nga Unibersohanong Oras"}
diff --git a/source/data/zone/chr.txt b/source/data/zone/chr.txt
index fd96a48..c0ac4c1 100644
--- a/source/data/zone/chr.txt
+++ b/source/data/zone/chr.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
chr{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"ᎠᏈᏣᏂ"}
diff --git a/source/data/zone/cy.txt b/source/data/zone/cy.txt
index 8089da1..9c45836 100644
--- a/source/data/zone/cy.txt
+++ b/source/data/zone/cy.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
cy{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/da.txt b/source/data/zone/da.txt
index d88ebd9..626b78d 100644
--- a/source/data/zone/da.txt
+++ b/source/data/zone/da.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
da{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/el.txt b/source/data/zone/el.txt
index aa43850..71dcbee 100644
--- a/source/data/zone/el.txt
+++ b/source/data/zone/el.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
el{
- Version{"2.1.49.26"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Αμπιτζάν"}
diff --git a/source/data/zone/es.txt b/source/data/zone/es.txt
index 3b7f4ce..bc4d04d 100644
--- a/source/data/zone/es.txt
+++ b/source/data/zone/es.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
es{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abiyán"}
diff --git a/source/data/zone/eu.txt b/source/data/zone/eu.txt
index f038090..e65f280 100644
--- a/source/data/zone/eu.txt
+++ b/source/data/zone/eu.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
eu{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/fa.txt b/source/data/zone/fa.txt
index 797bda2..a750557 100644
--- a/source/data/zone/fa.txt
+++ b/source/data/zone/fa.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fa{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"آبیجان"}
diff --git a/source/data/zone/fil.txt b/source/data/zone/fil.txt
index 7a1e9bd..a444f60 100644
--- a/source/data/zone/fil.txt
+++ b/source/data/zone/fil.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fil{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/fr.txt b/source/data/zone/fr.txt
index 2c17779..aca741b 100644
--- a/source/data/zone/fr.txt
+++ b/source/data/zone/fr.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fr{
- Version{"2.1.48.43"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/ga.txt b/source/data/zone/ga.txt
index 72dd09b..e0d5755 100644
--- a/source/data/zone/ga.txt
+++ b/source/data/zone/ga.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ga{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/gd.txt b/source/data/zone/gd.txt
index 4a75cae..42eae10 100644
--- a/source/data/zone/gd.txt
+++ b/source/data/zone/gd.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
gd{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/gl.txt b/source/data/zone/gl.txt
index 22dcd02..a4faa39 100644
--- a/source/data/zone/gl.txt
+++ b/source/data/zone/gl.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
gl{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/hi.txt b/source/data/zone/hi.txt
index 883ecd3..8fb81ca 100644
--- a/source/data/zone/hi.txt
+++ b/source/data/zone/hi.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hi{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"अबिदजान"}
diff --git a/source/data/zone/hy.txt b/source/data/zone/hy.txt
index 86d0f7e..8265fcb 100644
--- a/source/data/zone/hy.txt
+++ b/source/data/zone/hy.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hy{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Աբիջան"}
diff --git a/source/data/zone/is.txt b/source/data/zone/is.txt
index 2cde996..4f56c27 100644
--- a/source/data/zone/is.txt
+++ b/source/data/zone/is.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
is{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/ja.txt b/source/data/zone/ja.txt
index ad95050..d18667d 100644
--- a/source/data/zone/ja.txt
+++ b/source/data/zone/ja.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ja{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"アビジャン"}
diff --git a/source/data/zone/kk.txt b/source/data/zone/kk.txt
index d9558c1..45d05e3 100644
--- a/source/data/zone/kk.txt
+++ b/source/data/zone/kk.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kk{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиджан"}
diff --git a/source/data/zone/km.txt b/source/data/zone/km.txt
index c45e3de..27fbe2e 100644
--- a/source/data/zone/km.txt
+++ b/source/data/zone/km.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
km{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"អាប៊ីដ្យាន"}
diff --git a/source/data/zone/ko.txt b/source/data/zone/ko.txt
index d03bc3e..b12b2d2 100644
--- a/source/data/zone/ko.txt
+++ b/source/data/zone/ko.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ko{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"아비장"}
diff --git a/source/data/zone/kok.txt b/source/data/zone/kok.txt
index 94db2a6..8dc2c47 100644
--- a/source/data/zone/kok.txt
+++ b/source/data/zone/kok.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kok{
- Version{"2.1.48.4"}
+ Version{"2.1.49.82"}
zoneStrings{
"America:Adak"{
ec{"अडाक"}
diff --git a/source/data/zone/ky.txt b/source/data/zone/ky.txt
index 905b297..68c902a 100644
--- a/source/data/zone/ky.txt
+++ b/source/data/zone/ky.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ky{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиджан"}
diff --git a/source/data/zone/lb.txt b/source/data/zone/lb.txt
index d317a22..a01c148 100644
--- a/source/data/zone/lb.txt
+++ b/source/data/zone/lb.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
lb{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Accra"{
ec{"Accra"}
diff --git a/source/data/zone/mi.txt b/source/data/zone/mi.txt
index b272b9c..bb5f5f2 100644
--- a/source/data/zone/mi.txt
+++ b/source/data/zone/mi.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mi{
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
zoneStrings{
"America:Araguaina"{
ec{"Araguaina"}
diff --git a/source/data/zone/mt.txt b/source/data/zone/mt.txt
index 38c184f..2e58f59 100644
--- a/source/data/zone/mt.txt
+++ b/source/data/zone/mt.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mt{
- Version{"2.1.47.72"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/my.txt b/source/data/zone/my.txt
index a906b6e..e8c5ab1 100644
--- a/source/data/zone/my.txt
+++ b/source/data/zone/my.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
my{
- Version{"2.1.48.36"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"အာဘီဂျန်"}
diff --git a/source/data/zone/ne.txt b/source/data/zone/ne.txt
index 2e4a6ef..60d736f 100644
--- a/source/data/zone/ne.txt
+++ b/source/data/zone/ne.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ne{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"अविड्जान"}
diff --git a/source/data/zone/nl.txt b/source/data/zone/nl.txt
index 610dab4..953a308 100644
--- a/source/data/zone/nl.txt
+++ b/source/data/zone/nl.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
nl{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/nn.txt b/source/data/zone/nn.txt
index d3b723c..50ed7bf 100644
--- a/source/data/zone/nn.txt
+++ b/source/data/zone/nn.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
nn{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/or.txt b/source/data/zone/or.txt
index 64f4448..2d43db4 100644
--- a/source/data/zone/or.txt
+++ b/source/data/zone/or.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
or{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"ଆବିଦଜାନ"}
diff --git a/source/data/zone/ps.txt b/source/data/zone/ps.txt
index 1bb4e4a..7643a23 100644
--- a/source/data/zone/ps.txt
+++ b/source/data/zone/ps.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ps{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"ابيجان"}
diff --git a/source/data/zone/pt_PT.txt b/source/data/zone/pt_PT.txt
index 1a92b52..31d8c08 100644
--- a/source/data/zone/pt_PT.txt
+++ b/source/data/zone/pt_PT.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
pt_PT{
- Version{"2.1.47.89"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Addis_Ababa"{
ec{"Adis-Abeba"}
diff --git a/source/data/zone/qu.txt b/source/data/zone/qu.txt
index 24f798f..17363a5 100644
--- a/source/data/zone/qu.txt
+++ b/source/data/zone/qu.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
qu{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/ro.txt b/source/data/zone/ro.txt
index 818904d..ba56a4a 100644
--- a/source/data/zone/ro.txt
+++ b/source/data/zone/ro.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ro{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/root.txt b/source/data/zone/root.txt
index 4b01d10..0ceab3d 100644
--- a/source/data/zone/root.txt
+++ b/source/data/zone/root.txt
@@ -4,7 +4,7 @@
* ICU <specials> source: <path>/common/main/root.xml
*/
root{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Asmera"{
ec{"Asmara"}
diff --git a/source/data/zone/ru.txt b/source/data/zone/ru.txt
index 7e14e98..d6b370a 100644
--- a/source/data/zone/ru.txt
+++ b/source/data/zone/ru.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ru{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиджан"}
diff --git a/source/data/zone/rw.txt b/source/data/zone/rw.txt
index 11beb62..754d65d 100644
--- a/source/data/zone/rw.txt
+++ b/source/data/zone/rw.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
rw{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
zoneStrings{
gmtFormat{"GMT{0}"}
hourFormat{"+HH:mm;-HH:mm"}
diff --git a/source/data/zone/sd.txt b/source/data/zone/sd.txt
index fd32052..f4f9dd1 100644
--- a/source/data/zone/sd.txt
+++ b/source/data/zone/sd.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
sd{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"ابي جان"}
diff --git a/source/data/zone/so.txt b/source/data/zone/so.txt
index e710e31..94ac58b 100644
--- a/source/data/zone/so.txt
+++ b/source/data/zone/so.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
so{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjaan"}
diff --git a/source/data/zone/sr.txt b/source/data/zone/sr.txt
index 4f1f178..a4972b1 100644
--- a/source/data/zone/sr.txt
+++ b/source/data/zone/sr.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
sr{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиџан"}
diff --git a/source/data/zone/sr_Latn.txt b/source/data/zone/sr_Latn.txt
index d7fb975..7a94641 100644
--- a/source/data/zone/sr_Latn.txt
+++ b/source/data/zone/sr_Latn.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
sr_Latn{
%%Parent{"root"}
- Version{"2.1.48.77"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidžan"}
diff --git a/source/data/zone/tg.txt b/source/data/zone/tg.txt
index 9a29f5a..7d12c82 100644
--- a/source/data/zone/tg.txt
+++ b/source/data/zone/tg.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
tg{
- Version{"2.1.47.96"}
+ Version{"2.1.49.82"}
zoneStrings{
"Asia:Dushanbe"{
ec{"Душанбе"}
diff --git a/source/data/zone/th.txt b/source/data/zone/th.txt
index a13da84..d9194b1 100644
--- a/source/data/zone/th.txt
+++ b/source/data/zone/th.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
th{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"อาบีจาน"}
diff --git a/source/data/zone/ti.txt b/source/data/zone/ti.txt
index 0dc6b12..8bf293a 100644
--- a/source/data/zone/ti.txt
+++ b/source/data/zone/ti.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ti{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/tk.txt b/source/data/zone/tk.txt
index 01b04c6..c6c0cb9 100644
--- a/source/data/zone/tk.txt
+++ b/source/data/zone/tk.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
tk{
- Version{"2.1.48.86"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abijan"}
diff --git a/source/data/zone/tt.txt b/source/data/zone/tt.txt
index 8fe8050..35c33cf 100644
--- a/source/data/zone/tt.txt
+++ b/source/data/zone/tt.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
tt{
- Version{"2.1.47.85"}
+ Version{"2.1.49.82"}
zoneStrings{
"Etc:UTC"{
ls{"Бөтендөнья килештерелгән вакыты"}
diff --git a/source/data/zone/ug.txt b/source/data/zone/ug.txt
index b8fba20..bf22893 100644
--- a/source/data/zone/ug.txt
+++ b/source/data/zone/ug.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ug{
- Version{"2.1.47.82"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Sao_Tome"{
ec{"سان-تومې"}
diff --git a/source/data/zone/uk.txt b/source/data/zone/uk.txt
index 0d81407..9fa5950 100644
--- a/source/data/zone/uk.txt
+++ b/source/data/zone/uk.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
uk{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абіджан"}
diff --git a/source/data/zone/ur.txt b/source/data/zone/ur.txt
index 4ed6243..a41d8db 100644
--- a/source/data/zone/ur.txt
+++ b/source/data/zone/ur.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ur{
- Version{"2.1.48.20"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"عابدجان"}
diff --git a/source/data/zone/uz.txt b/source/data/zone/uz.txt
index dbd6bfa..ba1dadb 100644
--- a/source/data/zone/uz.txt
+++ b/source/data/zone/uz.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
uz{
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/uz_Cyrl.txt b/source/data/zone/uz_Cyrl.txt
index 1249265..d16e1ef 100644
--- a/source/data/zone/uz_Cyrl.txt
+++ b/source/data/zone/uz_Cyrl.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
uz_Cyrl{
%%Parent{"root"}
- Version{"2.1.48.17"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Asmera"{
ec{"Asmara"}
diff --git a/source/data/zone/vi.txt b/source/data/zone/vi.txt
index 110e7b4..8a0e191 100644
--- a/source/data/zone/vi.txt
+++ b/source/data/zone/vi.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
vi{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/source/data/zone/wo.txt b/source/data/zone/wo.txt
index d5d3cdf..82d285d 100644
--- a/source/data/zone/wo.txt
+++ b/source/data/zone/wo.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
wo{
- Version{"2.1.47.84"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Dakar"{
ec{"Dakar"}
diff --git a/source/data/zone/xh.txt b/source/data/zone/xh.txt
index 59006fb..3adb593 100644
--- a/source/data/zone/xh.txt
+++ b/source/data/zone/xh.txt
@@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
xh{
- Version{"2.1.48.89"}
+ Version{"2.1.49.82"}
}
diff --git a/source/data/zone/yue.txt b/source/data/zone/yue.txt
index b676216..acf98e2 100644
--- a/source/data/zone/yue.txt
+++ b/source/data/zone/yue.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
yue{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比讓"}
diff --git a/source/data/zone/yue_Hans.txt b/source/data/zone/yue_Hans.txt
index 11849a0..18381d2 100644
--- a/source/data/zone/yue_Hans.txt
+++ b/source/data/zone/yue_Hans.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
yue_Hans{
%%Parent{"root"}
- Version{"2.1.48.80"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比让"}
diff --git a/source/data/zone/zh.txt b/source/data/zone/zh.txt
index 79bd58c..8d0e63c 100644
--- a/source/data/zone/zh.txt
+++ b/source/data/zone/zh.txt
@@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
zh{
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比让"}
diff --git a/source/data/zone/zh_Hant.txt b/source/data/zone/zh_Hant.txt
index 2e8723d..a5252bb 100644
--- a/source/data/zone/zh_Hant.txt
+++ b/source/data/zone/zh_Hant.txt
@@ -2,7 +2,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
zh_Hant{
%%Parent{"root"}
- Version{"2.1.48.42"}
+ Version{"2.1.49.82"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比讓"}
diff --git a/source/extra/uconv/pkgdataMakefile.in b/source/extra/uconv/pkgdataMakefile.in
index c5916f2..f8a684f 100644
--- a/source/extra/uconv/pkgdataMakefile.in
+++ b/source/extra/uconv/pkgdataMakefile.in
@@ -14,9 +14,9 @@
## All the flags and other definitions are included here.
include $(top_builddir)/icudefs.mk
-MIDDLE_SO_TARGET=
-
OUTPUTFILE=pkgdata.inc
+MIDDLE_SO_TARGET=
+PKGDATA_TRAILING_SPACE=" "
all : clean
@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
diff --git a/source/i18n/decNumberLocal.h b/source/i18n/decNumberLocal.h
index a45b7d8..f6c291a 100644
--- a/source/i18n/decNumberLocal.h
+++ b/source/i18n/decNumberLocal.h
@@ -166,7 +166,9 @@
/* Set DECDPUNMAX -- the maximum integer that fits in DECDPUN */
/* digits, and D2UTABLE -- the initializer for the D2U table */
- #if DECDPUN==1
+ #ifndef DECDPUN
+ // no-op
+ #elif DECDPUN==1
#define DECDPUNMAX 9
#define D2UTABLE {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17, \
18,19,20,21,22,23,24,25,26,27,28,29,30,31,32, \
@@ -212,7 +214,7 @@
#define D2UTABLE {0,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,3,3,3, \
3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5, \
5,5,6,6,6,6}
- #elif defined(DECDPUN)
+ #else
#error DECDPUN must be in the range 1-9
#endif
@@ -228,9 +230,9 @@
/* D2U -- return the number of Units needed to hold d digits */
/* (runtime version, with table lookaside for small d) */
- #if DECDPUN==8
+ #if defined(DECDPUN) && DECDPUN==8
#define D2U(d) ((unsigned)((d)<=DECMAXD2U?d2utable[d]:((d)+7)>>3))
- #elif DECDPUN==4
+ #elif defined(DECDPUN) && DECDPUN==4
#define D2U(d) ((unsigned)((d)<=DECMAXD2U?d2utable[d]:((d)+3)>>2))
#else
#define D2U(d) ((d)<=DECMAXD2U?d2utable[d]:((d)+DECDPUN-1)/DECDPUN)
diff --git a/source/i18n/dtitvfmt.cpp b/source/i18n/dtitvfmt.cpp
index b380394..d6f799a 100644
--- a/source/i18n/dtitvfmt.cpp
+++ b/source/i18n/dtitvfmt.cpp
@@ -1130,7 +1130,9 @@
}
setIntervalPattern(UCAL_YEAR, skeleton, bestSkeleton, differenceInfo,
&extendedSkeleton, &extendedBestSkeleton);
- } else {
+ setIntervalPattern(UCAL_ERA, skeleton, bestSkeleton, differenceInfo,
+ &extendedSkeleton, &extendedBestSkeleton);
+ } else {
setIntervalPattern(UCAL_MINUTE, skeleton, bestSkeleton, differenceInfo);
setIntervalPattern(UCAL_HOUR, skeleton, bestSkeleton, differenceInfo);
setIntervalPattern(UCAL_AM_PM, skeleton, bestSkeleton, differenceInfo);
diff --git a/source/i18n/dtitvinf.cpp b/source/i18n/dtitvinf.cpp
index a289fc7..c0a6980 100644
--- a/source/i18n/dtitvinf.cpp
+++ b/source/i18n/dtitvinf.cpp
@@ -326,7 +326,9 @@
char c0;
if ((c0 = patternLetter[0]) != 0 && patternLetter[1] == 0) {
// Check that the pattern letter is accepted
- if (c0 == 'y') {
+ if (c0 == 'G') {
+ return UCAL_ERA;
+ } else if (c0 == 'y') {
return UCAL_YEAR;
} else if (c0 == 'M') {
return UCAL_MONTH;
diff --git a/source/i18n/erarules.cpp b/source/i18n/erarules.cpp
index 7249601..e375740 100644
--- a/source/i18n/erarules.cpp
+++ b/source/i18n/erarules.cpp
@@ -11,6 +11,7 @@
#include "unicode/ucal.h"
#include "unicode/ures.h"
#include "unicode/ustring.h"
+#include "unicode/timezone.h"
#include "cmemory.h"
#include "cstring.h"
#include "erarules.h"
@@ -290,9 +291,22 @@
}
void EraRules::initCurrentEra() {
- UDate now = ucal_getNow();
+ // Compute local wall time in millis using ICU's default time zone.
+ UErrorCode ec = U_ZERO_ERROR;
+ UDate localMillis = ucal_getNow();
+
+ int32_t rawOffset, dstOffset;
+ TimeZone* zone = TimeZone::createDefault();
+ // If we failed to create the default time zone, we are in a bad state and don't
+ // really have many options. Carry on using UTC millis as a fallback.
+ if (zone != nullptr) {
+ zone->getOffset(localMillis, FALSE, rawOffset, dstOffset, ec);
+ delete zone;
+ localMillis += (rawOffset + dstOffset);
+ }
+
int year, month0, dom, dow, doy, mid;
- Grego::timeToFields(now, year, month0, dom, dow, doy, mid);
+ Grego::timeToFields(localMillis, year, month0, dom, dow, doy, mid);
int currentEncodedDate = encodeDate(year, month0 + 1 /* changes to 1-base */, dom);
int eraIdx = numEras - 1;
while (eraIdx > 0) {
@@ -303,7 +317,8 @@
}
// Note: current era could be before the first era.
// In this case, this implementation returns the first era index (0).
- currentEra = eraIdx;}
+ currentEra = eraIdx;
+}
U_NAMESPACE_END
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/source/i18n/erarules.h b/source/i18n/erarules.h
index 620f27c..74b7862 100644
--- a/source/i18n/erarules.h
+++ b/source/i18n/erarules.h
@@ -75,7 +75,8 @@
/**
* Gets the current era index. This is calculated only once for an instance of
- * EraRules.
+ * EraRules. The current era calculation is based on the default time zone at
+ * the time of instantiation.
*
* @return era index of current era (or 0, when current date is before the first era)
*/
diff --git a/source/i18n/japancal.cpp b/source/i18n/japancal.cpp
index b15761c..1cb43f3 100644
--- a/source/i18n/japancal.cpp
+++ b/source/i18n/japancal.cpp
@@ -250,7 +250,7 @@
if (limitType == UCAL_LIMIT_MINIMUM || limitType == UCAL_LIMIT_GREATEST_MINIMUM) {
return 0;
}
- return gCurrentEra;
+ return gJapaneseEraRules->getNumberOfEras() - 1; // max known era, not gCurrentEra
case UCAL_YEAR:
{
switch (limitType) {
@@ -282,7 +282,7 @@
if (U_FAILURE(status)) {
return 0; // error case... any value
}
- if (era == gCurrentEra) {
+ if (era == gJapaneseEraRules->getNumberOfEras() - 1) { // max known era, not gCurrentEra
// TODO: Investigate what value should be used here - revisit after 4.0.
return handleGetLimit(UCAL_YEAR, UCAL_LIMIT_MAXIMUM);
} else {
diff --git a/source/i18n/regexcmp.cpp b/source/i18n/regexcmp.cpp
index 2d14aa8..e27c3ca 100644
--- a/source/i18n/regexcmp.cpp
+++ b/source/i18n/regexcmp.cpp
@@ -2285,7 +2285,7 @@
error(U_REGEX_LOOK_BEHIND_LIMIT);
break;
}
- if (minML == INT32_MAX && maxML == 0) {
+ if (minML == INT32_MAX) {
// This condition happens when no match is possible, such as with a
// [set] expression containing no elements.
// In principle, the generated code to evaluate the expression could be deleted,
@@ -2328,7 +2328,7 @@
error(U_REGEX_LOOK_BEHIND_LIMIT);
break;
}
- if (minML == INT32_MAX && maxML == 0) {
+ if (minML == INT32_MAX) {
// This condition happens when no match is possible, such as with a
// [set] expression containing no elements.
// In principle, the generated code to evaluate the expression could be deleted,
diff --git a/source/i18n/smpdtfmt.cpp b/source/i18n/smpdtfmt.cpp
index 627df9d..98f36b3 100644
--- a/source/i18n/smpdtfmt.cpp
+++ b/source/i18n/smpdtfmt.cpp
@@ -863,7 +863,7 @@
// Simple-minded hack to force Gannen year numbering for ja@calendar=japanese
// if format is non-numeric (includes 年) and fDateOverride is not already specified.
- // This does not update if applyPattern subsequently changes the pattern type.
+ // Now this does get updated if applyPattern subsequently changes the pattern type.
if (fDateOverride.isBogus() && fHasHanYearChar &&
fCalendar != nullptr && uprv_strcmp(fCalendar->getType(),"japanese") == 0 &&
uprv_strcmp(fLocale.getLanguage(),"ja") == 0) {
@@ -3885,6 +3885,42 @@
{
fPattern = pattern;
parsePattern();
+
+ // Hack to update use of Gannen year numbering for ja@calendar=japanese -
+ // use only if format is non-numeric (includes 年) and no other fDateOverride.
+ if (fCalendar != nullptr && uprv_strcmp(fCalendar->getType(),"japanese") == 0 &&
+ uprv_strcmp(fLocale.getLanguage(),"ja") == 0) {
+ if (fDateOverride==UnicodeString(u"y=jpanyear") && !fHasHanYearChar) {
+ // Gannen numbering is set but new pattern should not use it, unset;
+ // use procedure from adoptNumberFormat to clear overrides
+ if (fSharedNumberFormatters) {
+ freeSharedNumberFormatters(fSharedNumberFormatters);
+ fSharedNumberFormatters = NULL;
+ }
+ fDateOverride.setToBogus(); // record status
+ } else if (fDateOverride.isBogus() && fHasHanYearChar) {
+ // No current override (=> no Gannen numbering) but new pattern needs it;
+ // use procedures from initNUmberFormatters / adoptNumberFormat
+ umtx_lock(LOCK());
+ if (fSharedNumberFormatters == NULL) {
+ fSharedNumberFormatters = allocSharedNumberFormatters();
+ }
+ umtx_unlock(LOCK());
+ if (fSharedNumberFormatters != NULL) {
+ Locale ovrLoc(fLocale.getLanguage(),fLocale.getCountry(),fLocale.getVariant(),"numbers=jpanyear");
+ UErrorCode status = U_ZERO_ERROR;
+ const SharedNumberFormat *snf = createSharedNumberFormat(ovrLoc, status);
+ if (U_SUCCESS(status)) {
+ // Now that we have an appropriate number formatter, fill in the
+ // appropriate slot in the number formatters table.
+ UDateFormatField patternCharIndex = DateFormatSymbols::getPatternCharIndex(u'y');
+ SharedObject::copyPtr(snf, fSharedNumberFormatters[patternCharIndex]);
+ snf->deleteIfZeroRefCount();
+ fDateOverride.setTo(u"y=jpanyear", -1); // record status
+ }
+ }
+ }
+ }
}
//----------------------------------------------------------------------
diff --git a/source/i18n/timezone.cpp b/source/i18n/timezone.cpp
index f8711e4..f129d8b 100644
--- a/source/i18n/timezone.cpp
+++ b/source/i18n/timezone.cpp
@@ -278,7 +278,7 @@
UResourceBundle& res,
UErrorCode& ec)
{
-#if U_DEBUG_TZ
+#ifdef U_DEBUG_TZ
char buf[128];
id.extract(0, sizeof(buf)-1, buf, sizeof(buf), "");
#endif
diff --git a/source/i18n/unicode/udat.h b/source/i18n/unicode/udat.h
index 5b4a2bd..c67a6d6 100644
--- a/source/i18n/unicode/udat.h
+++ b/source/i18n/unicode/udat.h
@@ -488,19 +488,19 @@
* root/English abbreviated version (ASCII-range characters).
* @internal
*/
-#define JP_ERA_2019_ROOT "Qqqq"
+#define JP_ERA_2019_ROOT "Reiwa"
/**
* Constant for Unicode string name of new (in 2019) Japanese calendar era,
* Japanese abbreviated version (Han, or fullwidth Latin for testing).
* @internal
*/
-#define JP_ERA_2019_JA "\\uFF31\\uFF31"
+#define JP_ERA_2019_JA "\\u4EE4\\u548C"
/**
* Constant for Unicode string name of new (in 2019) Japanese calendar era,
* root and Japanese narrow version (ASCII-range characters).
* @internal
*/
-#define JP_ERA_2019_NARROW "Q"
+#define JP_ERA_2019_NARROW "R"
#endif // U_HIDE_INTERNAL_API
/**
diff --git a/source/tools/pkgdata/pkgdata.cpp b/source/tools/pkgdata/pkgdata.cpp
index aa0153d..226e4b3 100644
--- a/source/tools/pkgdata/pkgdata.cpp
+++ b/source/tools/pkgdata/pkgdata.cpp
@@ -504,7 +504,6 @@
if (o.files != NULL) {
pkg_deleteList(o.files);
}
-
return result;
}
@@ -544,6 +543,7 @@
int result = system(cmd);
if (result != 0) {
fprintf(stderr, "-- return status = %d\n", result);
+ result = 1; // system() result code is platform specific.
}
if (cmd != cmdBuffer && cmd != command) {
diff --git a/source/tools/toolutil/ucbuf.cpp b/source/tools/toolutil/ucbuf.cpp
index fa9edd1..d1d4043 100644
--- a/source/tools/toolutil/ucbuf.cpp
+++ b/source/tools/toolutil/ucbuf.cpp
@@ -178,7 +178,7 @@
memmove(buf->buffer,buf->currentPos,offset* sizeof(UChar));
}
-#if UCBUF_DEBUG
+#ifdef UCBUF_DEBUG
memset(pTarget+offset,0xff,sizeof(UChar)*(MAX_IN_BUF-offset));
#endif
if(buf->isBuffered){
@@ -295,7 +295,7 @@
}
outputWritten = (int32_t)(target - pTarget);
-#if UCBUF_DEBUG
+#ifdef UCBUF_DEBUG
{
int i;
target = pTarget;
